From 6771fff413935485b5dce61769f133a44533d15c Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期六, 30 五月 2026 14:35:14 +0800
Subject: [PATCH] fix
---
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index 4387a78..a665c8c 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -322,27 +322,43 @@
Integer sjzp1, Integer sjzp2, Integer zuc1, Integer zuc2, Integer mc1, Integer mc2,
Integer czgrcl1, Integer czgrcl2, Integer mac1, Integer mac2, Integer sjzx1, Integer sjzx2,
Integer dck1, Integer dck2,Integer driverDays,Integer pushType) {
- if (openCityId == null){
- openCityId = ShiroKit.getUser().getObjectId();
- }
+ Integer companyId = ShiroKit.getUser().getObjectId();
+ boolean companySystemSet = openCityId == null;
//改派设置
if("reassigningSet".equals(type)){
- TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("openCityId", openCityId));
+ EntityWrapper<TSysReformist> wrapper = new EntityWrapper<>();
+ if (companySystemSet) {
+ wrapper.eq("companyId", companyId);
+ } else {
+ wrapper.eq("openCityId", openCityId);
+ }
+ TSysReformist reformist = tSysReformistService.selectOne(wrapper);
if (SinataUtil.isNotEmpty(reformist)){
- reformist.setOpenCityId(openCityId);
+ if (companySystemSet) {
+ reformist.setCompanyId(companyId);
+ } else {
+ reformist.setOpenCityId(openCityId);
+ }
reformist.setMoney(one);
reformist.setIsSpecialCar(isSpecialCar);
reformist.setIsTaxiCar(isTaxiCar);
tSysReformistService.updateById(reformist);
}else {
reformist = new TSysReformist();
- reformist.setOpenCityId(openCityId);
+ if (companySystemSet) {
+ reformist.setCompanyId(companyId);
+ } else {
+ reformist.setOpenCityId(openCityId);
+ }
reformist.setMoney(one);
reformist.setIsSpecialCar(isSpecialCar);
reformist.setIsTaxiCar(isTaxiCar);
tSysReformistService.insert(reformist);
}
}
+ if (companySystemSet) {
+ openCityId = companyId;
+ }
if("driverPayDays".equals(type)){
TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("openCityId", openCityId));
if (SinataUtil.isNotEmpty(tDriverPayDays)){
--
Gitblit v1.7.1