From 00754b2fb8e71be738e6c312e11d62e64a4e82c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Dec 2021 17:13:59 +0800
Subject: [PATCH] 1.二维码批量生成修改，新增图片批量下载 2.用户修改 rtime bug 修改

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   80 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 72 insertions(+), 8 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 fce225c..3f09e05 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -100,7 +100,25 @@
             and bu.hold = #{user.hold}
         </if>
         <if test="user.deptId!=null and user.deptId != ''">
-            and (bd.id = #{user.deptId} or bd.parent_id = #{user.deptId})
+            and bd.id in
+            (
+                select id from blade_dept where id = #{user.deptId}
+                union
+                SELECT
+                id
+                FROM
+                (
+                SELECT
+                t1.id,t1.parent_id,t1.dept_name,
+                IF
+                ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
+                FROM
+                ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
+                ( SELECT @pids := #{user.deptId} ) t2
+                ) t3
+                WHERE
+                ischild != 0
+            )
         </if>
         <if test="user.roleId!=null and user.roleId != ''">
             and bu.role_id = #{user.roleId}
@@ -166,7 +184,25 @@
             and real_name like concat(concat('%', #{user.realName}),'%')
         </if>
         <if test="user.deptId!=null and user.deptId != ''">
-            and (bd.id = #{user.deptId} or bd.parent_id = #{user.deptId})
+            and bd.id in
+            (
+                select id from blade_dept where id = #{user.deptId}
+                union
+                SELECT
+                id
+                FROM
+                (
+                SELECT
+                t1.id,t1.parent_id,t1.dept_name,
+                IF
+                ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
+                FROM
+                ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
+                ( SELECT @pids := #{user.deptId} ) t2
+                ) t3
+                WHERE
+                ischild != 0
+            )
         </if>
         <if test="user.userType!=null and user.userType != ''">
             and user_type = #{user.userType}
@@ -275,6 +311,9 @@
         <if test="user.status!=null and user.status != ''">
             and bu.status = #{user.status}
         </if>
+        <if test="user.equipmentCode!=null">
+            and bu.equipment_code !="" and bu.equipment_code is not null and bu.equipment_code !=null
+        </if>
         <if test="user.jurisdiction!=null and user.jurisdiction != ''">
             and bu.jurisdiction = #{user.jurisdiction}
         </if>
@@ -374,13 +413,9 @@
             where 1 = 1
             <if test="user.examType==1">
                 and a.isApply != 1
-                and a.age&gt;=18
-                and a.age&lt;=60
             </if>
             <if test="user.examType==2">
                 and a.isTrain != 1
-                and a.age&gt;=18
-                and a.age&lt;=60
             </if>
         )
     </select>
@@ -647,6 +682,7 @@
     <!--导出保安员信息-->
     <select id="exportSecurityInfo" resultType="org.springblade.modules.system.excel.SecurityExcel">
         select
+        distinct bu.id,
         bd.dept_name deptId,
         bu.real_name realName,
         bu.phone,
@@ -695,7 +731,25 @@
             and bu.hold = #{user.hold}
         </if>
         <if test="user.deptId!=null and user.deptId != ''">
-            and (bd.id = #{user.deptId} or bd.parent_id = #{user.deptId})
+            and bd.id in
+            (
+                select id from blade_dept where id = #{user.deptId}
+                union
+                SELECT
+                id
+                FROM
+                (
+                SELECT
+                t1.id,t1.parent_id,t1.dept_name,
+                IF
+                ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
+                FROM
+                ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
+                ( SELECT @pids := #{user.deptId} ) t2
+                ) t3
+                WHERE
+                ischild != 0
+            )
         </if>
         <if test="user.roleId!=null and user.roleId != ''">
             and bu.role_id = #{user.roleId}
@@ -733,6 +787,16 @@
         ORDER BY bu.id desc
     </select>
 
-
+    <!--查询押运人员编码不为null的保安信息-->
+    <select id="selectEquipent" resultType="java.util.HashMap">
+        SELECT id,
+               equipment_code as code
+        FROM blade_user
+        WHERE dept_id = '1460129345988239362'
+          AND role_id = '1412226235153731586'
+          AND is_deleted = 0
+          AND `status` = 1
+          AND equipment_code IS NOT NULL
+    </select>
 
 </mapper>

--
Gitblit v1.9.3