From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改

---
 src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
index a5c88ab..f00bacf 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
@@ -12,8 +12,19 @@
             blade_dept bt
         ON
             se.dept_id = bt.id
+        left join
+        sys_information si
+        on
+        si.departmentid = bt.id
+        left join
+        sys_jurisdiction sj
+        on
+        sj.id = si.jurisdiction
         WHERE
             1=1
+        <if test="equipage.jurisdiction!=null and equipage.jurisdiction!='' and equipage.jurisdiction!='1372091709474910209'">
+            and (sj.id = #{equipage.jurisdiction} or sj.parent_id = #{equipage.jurisdiction})
+        </if>
         <if test="equipage.tenantName!=null and  equipage.tenantName!=''">
             and bt.dept_name like concat('%', #{equipage.tenantName},'%')
         </if>
@@ -26,6 +37,9 @@
         <if test="equipage.name!=null and equipage.name!=''">
             and se.name like concat('%', #{equipage.name},'%')
         </if>
+        <if test="equipage.brand!=null and equipage.brand!=''">
+            and se.brand like concat('%', #{equipage.brand},'%')
+        </if>
         <if test="equipage.personInCharge!=null and equipage.personInCharge!=''">
             and se.person_in_charge like concat('%', #{equipage.personInCharge},'%')
         </if>

--
Gitblit v1.9.3