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 |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 3adc6b5..3f09e05 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -682,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,
@@ -786,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