diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java b/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java index 3e823a6..ea27208 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java @@ -226,6 +226,7 @@ public class TaskController extends BaseController { } } // 处理业务类型、业务状态查询参数 + AICUser aicUser = getLoginUser(request); if(customParamMap != null && customParamMap.get("bustype") != null && customParamMap.get("busstatus") != null && customParamMap.get("bustypeAndCurrentNode") != null){ Object bustypeAndStatus1 = customParamMap.get("bustypeAndStatus"); if (bustypeAndStatus1 instanceof List) { @@ -246,7 +247,6 @@ public class TaskController extends BaseController { // 信用修复 if (customParamMap != null && customParamMap.get("type") != null && "repair".equals(customParamMap.get("type"))) { //处理年报申请过来的信用修复待办 - AICUser aicUser = getLoginUser(request); //倒计时工作日开关 boolean isGzrNum = customParamMap.containsKey("gzrNumSwitch") && (boolean)customParamMap.get("gzrNumSwitch"); if (isGzrNum) { @@ -286,6 +286,9 @@ public class TaskController extends BaseController { } // 获取待办分页 + if (customParamMap != null && !customParamMap.containsKey("areaCode")) { //判断如果没有加区域的值,就给用户所在区局 + customParamMap.put("areaCode", aicUser.getRegionID()); + } IPage page = taskListService.searchUnionTaskPage(new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), taskListParam, customParamMap); List taskListUnionDtoList = page.getRecords(); for(TaskListUnionDto taskListUnionDto : taskListUnionDtoList){