From 35a6e9cedc2f44bebc9e4ec81a429eddc8b631ea Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 22 Sep 2021 11:41:42 +0800
Subject: [PATCH] 用户查询接口修改，部门名称需拼接父部门名称

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   41 +++++++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index ca3b0e2..c0dc0cb 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -47,6 +47,7 @@
         <result column="birthtime" property="birthtime"/>
         <result column="healstats" property="healstats"/>
         <result column="soil" property="soil"/>
+        <result column="reason_for_leav" property="reasonForLeav"/>
     </resultMap>
 
     <!--带坐标-->
@@ -149,26 +150,13 @@
         <if test="user.hold!=null and user.hold != ''">
             and hold = #{user.hold}
         </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
-        and jurisdiction = #{user.jurisdiction}
-    </if>
+            and jurisdiction = #{user.jurisdiction}
+        </if>
         <if test="user.securitynumber!=null and user.securitynumber != ''">
             and securitynumber = #{user.securitynumber}
         </if>
         <if test="user.examinationType!=null and user.examinationType != ''">
             and examination_type = #{user.examinationType}
-        </if>
-        <if test="deptIdList!=null and deptIdList.size>0">
-            and id in (
-            SELECT
-            user_id
-            FROM
-            blade_user_dept
-            WHERE
-            dept_id IN
-            <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-            )
         </if>
         ORDER BY id
     </select>
@@ -276,7 +264,7 @@
             and bu.dept_id = #{user.deptId}
         </if>
         <if test="user.isApply!=null">
-            and sa.is_apply = #{user.isApply}
+            and bu.is_apply = #{user.isApply}
         </if>
         <if test="user.roleId!=null and user.roleId != ''">
             and bu.role_id = #{user.roleId}
@@ -441,6 +429,10 @@
         sys_information si
         on
         bd.id = si.departmentid
+        left join
+        blade_role br
+        on
+        br.id = bu.role_id
         where
         1=1
         and bu.status = 1
@@ -450,7 +442,7 @@
         </if>
         <if test="jurisdiction!=null and jurisdiction!=''">
             and si.jurisdiction = #{jurisdiction}
-            and dept_category=2
+            and br.role_alias = "公安管理员"
         </if>
     </select>
 
@@ -462,6 +454,10 @@
         blade_dept bd
         on
         bd.id = bu.dept_id
+        left join
+        blade_role br
+        on
+        br.id = bu.role_id
         where
         1=1
         and bu.status = 1
@@ -471,7 +467,7 @@
         </if>
         <if test="jurisdiction!=null and jurisdiction!=''">
             and bu.jurisdiction = #{jurisdiction}
-            and dept_category=2
+            and br.role_alias = "公安管理员"
         </if>
     </select>
 
@@ -493,4 +489,13 @@
     <select id="selectCountAccount" resultType="java.lang.Integer">
         select count(*) from blade_user where account = #{account}
     </select>
+
+    <!--查询当前部门名称及父级部门名称-->
+    <select id="getDeptName" resultType="java.lang.String">
+        (select dept_name from blade_dept where id = #{deptId} and 1=1)
+        union
+        (
+            select dept_name from blade_dept where id =  (select parent_id from blade_dept where id= #{deptId} and 1=1)
+        )
+    </select>
 </mapper>

--
Gitblit v1.9.3