From 0e4bfb752c0a37b6fe6037125737d8509f51d080 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 三月 2026 14:52:32 +0800
Subject: [PATCH] 修改bug

---
 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
index 87b3628..d37e689 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
@@ -518,7 +518,7 @@
             left join t_driver t2 on t1.userId = t2.id
             where t1.userType = 2 and t1.orderType=6 and t2.authState in (2, 3) and t2.flag != 3
             <if test="roleType != null and roleType != '' and roleType == 2">
-                and (t2.companyId = #{objectId} or FIND_IN_SET(t1.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{objectId} GROUP BY superiorId)))
+                and (t2.companyId = #{objectId} or FIND_IN_SET(t2.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{objectId} GROUP BY superiorId)))
             </if>
             <if test="roleType != null and roleType != '' and roleType == 3">
                 and t2.franchiseeId = #{objectId}
@@ -583,7 +583,7 @@
             left join t_driver t2 on t1.userId = t2.id
             where t1.userType=2 and t1.type = 2 and t1.state!=3 and t2.authState in (2, 3) and t2.flag != 3
             <if test="roleType != null and roleType != '' and roleType == 2">
-                and (t2.companyId = #{objectId} or FIND_IN_SET(t1.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{objectId} GROUP BY superiorId)))
+                and (t2.companyId = #{objectId} or FIND_IN_SET(t2.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{objectId} GROUP BY superiorId)))
             </if>
             <if test="roleType != null and roleType != '' and roleType == 3">
                 and t2.franchiseeId = #{objectId}
@@ -608,7 +608,7 @@
             left join t_driver t2 on t1.driverId = t2.id
             where  t1.status=2 and t2.authState in (2, 3) and t2.flag != 3
             <if test="roleType != null and roleType != '' and roleType == 2">
-                and (t2.companyId = #{objectId} or FIND_IN_SET(t1.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{objectId} GROUP BY superiorId)))
+                and (t2.companyId = #{objectId} or FIND_IN_SET(t2.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{objectId} GROUP BY superiorId)))
             </if>
             <if test="roleType != null and roleType != '' and roleType == 3">
                 and t2.franchiseeId = #{objectId}
@@ -678,7 +678,7 @@
             left join t_driver t2 on t1.userId = t2.id
             where t1.userType = 2 and t1.orderType=6 and t2.authState in (2, 3) and t2.flag != 3
             <if test="roleType != null and roleType != '' and roleType == 2">
-                and (t2.companyId = #{objectId} or FIND_IN_SET(t1.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{objectId} GROUP BY superiorId)))
+                and (t2.companyId = #{objectId} or FIND_IN_SET(t2.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{objectId} GROUP BY superiorId)))
             </if>
             <if test="roleType != null and roleType != '' and roleType == 3">
                 and t2.franchiseeId = #{objectId}
@@ -743,7 +743,7 @@
             left join t_driver t2 on t1.userId = t2.id
             where t1.userType=2 and t1.type = 2 and t1.state!=3 and t2.authState in (2, 3) and t2.flag != 3
             <if test="roleType != null and roleType != '' and roleType == 2">
-                and (t2.companyId = #{objectId} or FIND_IN_SET(t1.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{objectId} GROUP BY superiorId)))
+                and (t2.companyId = #{objectId} or FIND_IN_SET(t2.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{objectId} GROUP BY superiorId)))
             </if>
             <if test="roleType != null and roleType != '' and roleType == 3">
                 and t2.franchiseeId = #{objectId}
@@ -768,7 +768,7 @@
             left join t_driver t2 on t1.driverId = t2.id
             where  t1.status=2 and t2.authState in (2, 3) and t2.flag != 3
             <if test="roleType != null and roleType != '' and roleType == 2">
-                and (t2.companyId = #{objectId} or FIND_IN_SET(t1.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{objectId} GROUP BY superiorId)))
+                and (t2.companyId = #{objectId} or FIND_IN_SET(t2.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{objectId} GROUP BY superiorId)))
             </if>
             <if test="roleType != null and roleType != '' and roleType == 3">
                 and t2.franchiseeId = #{objectId}

--
Gitblit v1.7.1