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和管理后台报表

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index 62b2bd0..9e3b0cd 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -90,10 +90,10 @@
         <if test="null != companyId">
             <choose>
                 <when test="companyId != 1">
-                    and companyId = #{companyId} or franchiseeId = #{companyId}
+                    and companyId = #{companyId}
                 </when>
                 <otherwise>
-                    and companyId is null or companyId = 0 or companyId = 1 or franchiseeId is null or franchiseeId = 0
+                    and companyId is null or companyId = 0 or companyId = 1
                 </otherwise>
             </choose>
 
@@ -117,10 +117,10 @@
         <if test="null != companyId">
             <choose>
                 <when test="companyId != 1">
-                    and companyId = #{companyId} or franchiseeId = #{companyId}
+                    and companyId = #{companyId}
                 </when>
                 <otherwise>
-                    and companyId is null or companyId = 0 or companyId = 1 or franchiseeId is null or franchiseeId = 0
+                    and companyId is null or companyId = 0 or companyId = 1
                 </otherwise>
             </choose>
 

--
Gitblit v1.7.1