From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   51 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 44 insertions(+), 7 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 c0dc0cb..76e8469 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -67,6 +67,10 @@
         on
         si.departmentid = bd.id
         left join
+        sys_jurisdiction sj
+        on
+        sj.id = si.jurisdiction
+        left join
         sys_live_location sll
         on
         sll.worker_id = bu.id
@@ -98,7 +102,7 @@
             and bu.status = #{user.status}
         </if>
         <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
-            and si.jurisdiction = #{user.jurisdiction}
+            and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
         </if>
         <if test="user.realName!=null and user.realName != ''">
             and bu.real_name like concat('%', #{user.realName},'%')
@@ -122,7 +126,20 @@
     </select>
 
     <select id="selectUserPage" resultMap="userResultMap">
-        select * from blade_user where is_deleted = 0
+        select bu.* from blade_user bu
+        left join
+        blade_dept bd
+        on
+        bd.id = bu.dept_id
+        left join
+        sys_information si
+        on
+        si.departmentid = bd.id
+        left join
+        sys_jurisdiction sj
+        on
+        sj.id = si.jurisdiction
+        where bu.is_deleted = 0
         <if test="user.tenantId!=null and user.tenantId != ''">
             and tenant_id = #{user.tenantId}
         </if>
@@ -133,7 +150,7 @@
             and real_name like concat(concat('%', #{user.realName}),'%')
         </if>
         <if test="user.deptId!=null and user.deptId != ''">
-            and dept_id like concat(concat('%', #{user.deptId}),'%')
+            and (bd.id = #{user.deptId} or bd.parent_id = #{user.deptId})
         </if>
         <if test="user.userType!=null and user.userType != ''">
             and user_type = #{user.userType}
@@ -149,8 +166,9 @@
         </if>
         <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>
+        <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
+            and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
         </if>
         <if test="user.securitynumber!=null and user.securitynumber != ''">
             and securitynumber = #{user.securitynumber}
@@ -158,7 +176,7 @@
         <if test="user.examinationType!=null and user.examinationType != ''">
             and examination_type = #{user.examinationType}
         </if>
-        ORDER BY id
+        ORDER BY bu.id
     </select>
 
     <select id="getUser" resultMap="userResultMap">
@@ -168,6 +186,7 @@
           and account = #{param2}
           and password = #{param3}
           and is_deleted = 0
+          and status = 1
     </select>
 
     <select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
@@ -256,10 +275,15 @@
         blade_dept bd
         on
         bu.dept_id = bd.id
+        left join
+        blade_role br
+        on
+        br.id = bu.role_id
         where
         bu.is_deleted = 0
         and
         (hold = 2 or hold = 3)
+        and br.role_alias = "保安"
         <if test="user.deptId!=null and user.deptId != ''">
             and bu.dept_id = #{user.deptId}
         </if>
@@ -308,12 +332,17 @@
             blade_dept bd
             on
             bu.dept_id = bd.id
+            left join
+            blade_role br
+            on
+            br.id = bu.role_id
             where
             bu.is_deleted = 0
             and bu.status = 1
-            and bu.examination_type != 1
+            and (bu.examination_type != 1 or bu.examination_type is null)
             and (hold = 2 or hold = 3)
             and bd.id = #{user.deptId}
+            and br.role_alias = '保安'
             <if test="user.examType==1">
                 and bu.is_apply != 1
             </if>
@@ -498,4 +527,12 @@
             select dept_name from blade_dept where id =  (select parent_id from blade_dept where id= #{deptId} and 1=1)
         )
     </select>
+
+    <!--查询用户表中未删除，未离职的用户信息-->
+    <select id="getUserInfo" resultType="org.springblade.modules.system.entity.User">
+        select id,account from blade_user
+        where account = #{account}
+        and is_deleted = 0
+        and status = 1
+    </select>
 </mapper>

--
Gitblit v1.9.3