From b1f2f102034b4433201225b67a9fc78c08e532f0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 06 六月 2025 18:35:03 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
index 1a6338f..804e12e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
@@ -141,10 +141,10 @@
<select id="getCanSelectTaxiDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT dd.*,c1.name as companyName,c2.name as franchiseeName from t_driver AS dd
LEFT JOIN t_company as c1 on c1.id = dd.companyId
- LEFT JOIN t_company as c2 on c2.id = dd.franchiseeId
+ LEFT JOIN t_company as c2 on c2.id = dd.companyId
LEFT JOIN (SELECT * from t_driver_service where type = 2) as ds on ds.driverId = dd.id
<where>
- (dd.companyId = #{companyId} or dd.franchiseeId = #{companyId}) and dd.authState = 2 and dd.state = 2 and (ds.id is not null ) and (dd.carId is not null)
+ dd.companyId = #{companyId} and dd.authState = 2 and dd.state = 2 and (ds.id is not null ) and (dd.carId is not null)
<if test="name != null and name != ''">
and CONCAT(dd.firstName, ' ', dd.lastName) LIKE CONCAT('%',#{name},'%')
</if>
--
Gitblit v1.7.1