From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml
index f425ce8..f6b60f1 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml
@@ -17,6 +17,7 @@
<result column="drivingLicensePhoto" property="drivingLicensePhoto"/>
<result column="annualInspectionTime" property="annualInspectionTime"/>
<result column="insurancePhoto" property="insurancePhoto" />
+ <result column="peopleAndCarsPhone" property="peopleAndCarsPhone"/>
<result column="commercialInsuranceTime" property="commercialInsuranceTime"/>
<result column="insertTime" property="insertTime"/>
<result column="state" property="state"/>
@@ -52,8 +53,7 @@
from t_car a
left join t_car_model b on (a.carModelId = b.id)
left join t_car_brand c on (b.brandId = c.id)
- where a.state = 1
- and a.driverId=#{driverId}
+ where a.state = 1 and authState != 4 and a.driverId=#{driverId} and a.id != (select carId from t_driver where id = #{driverId})
</select>
<select id="query" resultType="com.stylefeng.guns.modular.system.model.Car">
--
Gitblit v1.7.1