longz
2026-05-07 6fb7c01ece7ac072e652c44250a8b62618d8fd97
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -322,6 +322,9 @@
                        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();
        }
        //改派设置
        if("reassigningSet".equals(type)){
           TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("openCityId", openCityId));
@@ -400,6 +403,10 @@
                sysPushType.setOpenCityId(openCityId);
                sysPushType.setPushType(pushType);
                tSysPushTypeService.updateById(sysPushType);
            }
            if (pushType != null && pushType == 2) {
                return ResultUtil.success();
            }
@@ -516,6 +523,10 @@
        //取消设置
        if("cancelOrderSettings".equals(type)){
            TSysPushType currentPushType = tSysPushTypeService.selectOne(new EntityWrapper<TSysPushType>().eq("openCityId", openCityId));
            if (currentPushType != null && currentPushType.getPushType() != null && currentPushType.getPushType() == 2) {
                return ResultUtil.success();
            }
            //普通取消设置(快车)
           TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 1).eq("orderType", 1));
            if (SinataUtil.isNotEmpty(ptCancelOne)){