From bafe10232e18d07f731a74c8df4e63b4cd06b70b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 17 Sep 2021 15:10:20 +0800
Subject: [PATCH] 1.用户新增审查时间 2.派遣更改修改

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 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 785194e..7123f03 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>
 
     <!--带坐标-->
@@ -75,8 +76,11 @@
         br.id = bu.role_id
         where
         bu.is_deleted = 0
+        and bd.parent_id!=1425365577303621633
+        and bd.id != 1425365577303621633
+        and bd.id != 1432625856013971457
         <if test="user.account!=null and user.account != ''">
-            and bu.account = #{user.account}
+            and bu.account like concat('%', #{user.account},'%')
         </if>
         <if test="user.hold!=null and user.hold != ''">
             and bu.hold = #{user.hold}
@@ -93,7 +97,7 @@
         <if test="user.status!=null and user.status != ''">
             and bu.status = #{user.status}
         </if>
-        <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1123598813738675201'">
+        <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
             and si.jurisdiction = #{user.jurisdiction}
         </if>
         <if test="user.realName!=null and user.realName != ''">
@@ -123,7 +127,7 @@
             and tenant_id = #{user.tenantId}
         </if>
         <if test="user.account!=null and user.account != ''">
-            and account != #{user.account}
+            and account like concat('%', #{user.account},'%')
         </if>
         <if test="user.realName!=null and user.realName != ''">
             and real_name like concat(concat('%', #{user.realName}),'%')
@@ -153,19 +157,6 @@
         </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>
@@ -219,7 +210,6 @@
         br.id = bu.role_id
         where
         bu.is_deleted = 0
-        and bd.dept_category = 1
         and role_alias = '保安'
         <if test="user.realName!=null and user.realName != ''">
             and bu.real_name like concat(concat('%', #{user.realName}),'%')
@@ -269,14 +259,12 @@
         where
         bu.is_deleted = 0
         and
-        bd.dept_category = 1
-        and
         (hold = 2 or hold = 3)
         <if test="user.deptId!=null and user.deptId != ''">
             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}
@@ -323,7 +311,7 @@
             where
             bu.is_deleted = 0
             and bu.status = 1
-            and bd.dept_category = 1
+            and bu.examination_type != 1
             and (hold = 2 or hold = 3)
             and bd.id = #{user.deptId}
             <if test="user.examType==1">
@@ -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>
 
@@ -489,4 +485,8 @@
         and sd.status = 0
     </select>
 
+    <!--查询账号相同的数量-->
+    <select id="selectCountAccount" resultType="java.lang.Integer">
+        select count(*) from blade_user where account = #{account}
+    </select>
 </mapper>

--
Gitblit v1.9.3