From 644ed3e30bbee9a417dfbe649f2a72df25a7efb1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 18 May 2022 10:10:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 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 68eb8e8..5352711 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
@@ -24,7 +24,7 @@
and sc.dept_id = #{car.deptId}
</if>
<if test="car.type!=null">
- and car.equipment_code !="" and car.equipment_code is not null and car.equipment_code !=null
+ and sc.equipment_code is not null
</if>
<if test="car.numberType!=null and car.numberType!=''">
and sc.number_type like concat('%', #{car.numberType},'%')
@@ -53,4 +53,7 @@
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