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/dispatcher/mapper/DispatcherMapper.xml | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
index aaa4e70..16a5fd6 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -26,7 +26,16 @@
blade_user bu
on
bu.id = sd.user_ids
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = sdu.jurisdiction
where 1=1
+ and bu.status =1
+ and bu.is_deleted = 0
+ <if test="dispatcher.jurisdiction!=null and dispatcher.jurisdiction!='' and dispatcher.jurisdiction!='1372091709474910209'">
+ and (sj.id = #{dispatcher.jurisdiction} or sj.parent_id = #{dispatcher.jurisdiction})
+ </if>
<if test="dispatcher.dispatcherUnitId!=null">
and sd.dispatcher_unit_id = #{dispatcher.dispatcherUnitId}
</if>
@@ -34,7 +43,6 @@
and sd.dept_id = #{dispatcher.deptId}
</if>
<if test="dispatcher.dispatch!=null and dispatcher.dispatch!=''">
- and bu.dispatch = #{dispatcher.dispatch}
and sd.status = #{dispatcher.dispatch}
</if>
<if test="dispatcher.userIds!=null and dispatcher.userIds!=''">
@@ -42,6 +50,9 @@
</if>
<if test="dispatcher.name!=null and dispatcher.name!=''">
and sd.name like concat('%', #{dispatcher.name},'%')
+ </if>
+ <if test="dispatcher.securityName!=null and dispatcher.securityName!=''">
+ and bu.real_name like concat('%', #{dispatcher.securityName},'%')
</if>
<if test="dispatcher.cardid!=null and dispatcher.cardid!=''">
and sd.cardid like concat('%', #{dispatcher.cardid},'%')
@@ -95,4 +106,8 @@
and sd.status = 0
</select>
+ <update id="updateEndtime">
+ update sys_dispatcher set end_time =#{endTime} where dispatcher_unit_id =#{disId}
+ </update>
+
</mapper>
--
Gitblit v1.9.3