From 415017b0673c08818997189b44af8f1d04a55078 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期二, 05 八月 2025 20:08:14 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong --- DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml index cbea92c..0a99479 100644 --- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml +++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml @@ -340,7 +340,7 @@ c.remark as cancelRemark, c.money as cancelPayMoney, if(c.userType = 1, '用户取消', '平台取消') as cancelUser, - (select isSpecialCar from t_sys_reformist where companyId = a.companyId) as reassign + (select isSpecialCar from t_sys_reformist where openCityId = #{openCityId}) as reassign from t_order_private_car a left join t_user b on (a.userId = b.id) left join t_order_cancel c on (a.id = c.orderId and c.orderType = 1 and c.state = 2) -- Gitblit v1.7.1