From 0e5b425783f87d734d07e83779988c8d18bb2dc7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 09 Nov 2021 23:19:31 +0800
Subject: [PATCH] 保安员新增,修改接口修改,判断是否为民警,导入接口修改

---
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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..6065141 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,14 @@
             blade_user bu
         on
             bu.id = sd.user_ids
+        left join
+            sys_jurisdiction sj
+        on
+            sj.id = sdu.jurisdiction
         where 1=1
+        <if test="dispatcher.jurisdiction!=null  and dispatcher.jurisdiction!=''">
+            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>
@@ -43,6 +50,9 @@
         <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},'%')
         </if>

--
Gitblit v1.9.3