From a9f394b28bb124732b7465d8e0880dfd3078b1ef Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 15 Jul 2021 10:51:51 +0800
Subject: [PATCH] 1.保安员证编码
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index 1d20f11..a66b5b3 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -92,7 +92,10 @@
FROM
blade_dept dept
WHERE
- dept.parent_id = #{param2} AND dept.is_deleted = 0
+ dept.is_deleted = 0
+ <if test="param2!=null and param2!=0">
+ and dept.parent_id = #{param2}
+ </if>
<if test="param1!=null and param1!=''">
and dept.tenant_id = #{param1}
</if>
@@ -168,10 +171,10 @@
<select id="selectIn" resultType="java.util.HashMap">
SELECT
- id,
- dept_name
+ id as deptid,
+ dept_name as deptname
FROM
- blade_dept
+ blade_dept where is_deleted = 0
</select>
<!--统计单位类型数量-->
--
Gitblit v1.9.3