From 3b6789ae8cb8138533b2cc362f37ad94b605a58d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 24 九月 2025 10:57:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index f94fd95..3213550 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -319,7 +319,7 @@
updateTime as updateTime,
updateUser as updateUser
from t_driver
- where flag != 3 and state = 3 and authState = 2
+ where flag != 3 and state in (2,3) and authState = 2
<if test="null != companyId">
<choose>
<when test="companyId != 1">
@@ -354,7 +354,7 @@
a.headImgUrl as avatar,
case when b.telX is null then a.phone else b.telX end as phone,
c.carLicensePlate as carCode,
- CONCAT(F.`name`, d.`name`, '.', c.carColor) as carName,
+ CONCAT(f.`name`, d.`name`, '.', c.carColor) as carName,
(select sum(fraction) / count(id) from t_order_evaluate where driverId = a.id) as score,
(
(select count(id) from t_order_private_car where state in (7, 8, 9) and driverId = a.id) +
--
Gitblit v1.7.1