From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
index 7b70ea2..5f2ba22 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
@@ -12,8 +12,19 @@
blade_dept bt
ON
sc.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="car.jurisdiction!=null and car.jurisdiction!='' and car.jurisdiction!='1372091709474910209'">
+ and (sj.id = #{car.jurisdiction} or sj.parent_id = #{car.jurisdiction})
+ </if>
<if test="car.tenantName!=null and car.tenantName!=''">
and bt.dept_name like concat('%', #{car.tenantName},'%')
</if>
@@ -29,6 +40,12 @@
<if test="car.carType!=null and car.carType!=''">
and sc.car_type like concat('%', #{car.carType},'%')
</if>
+ <if test="car.brand!=null and car.brand!=''">
+ and sc.brand like concat('%', #{car.brand},'%')
+ </if>
+ <if test="car.mode!=null and car.mode!=''">
+ and sc.mode like concat('%', #{car.mode},'%')
+ </if>
<if test="car.personInCharge!=null and car.personInCharge!=''">
and sc.person_in_charge like concat('%', #{car.personInCharge},'%')
</if>
--
Gitblit v1.9.3