From 7d304cdc65aa3cdf75276d7a19e1805992b854cd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 03 Dec 2021 16:47:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml | 7 +++++++
1 files changed, 7 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..c564968 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
@@ -32,6 +32,9 @@
<if test="car.personInCharge!=null and car.personInCharge!=''">
and sc.person_in_charge like concat('%', #{car.personInCharge},'%')
</if>
+ <if test="car.type!=null">
+ and sc.equipment_code is not null
+ </if>
</select>
<!--车辆详情信息-->
@@ -50,4 +53,8 @@
and sc.id = #{car.id}
</if>
</select>
+
+ <select id="selectCar" resultType="java.util.HashMap">
+ SELECT * FROM `sys_car` WHERE equipment_code IS NOT NULL
+ </select>
</mapper>
--
Gitblit v1.9.3