fix bug

sop-api/src/main/java/com/qmth/sop/server/api/TBDingApplyController.java

@@ -66,13 +66,13 @@ public class TBDingApplyController {
             @ApiParam(value = "异常结束时间") @RequestParam(required = false) Long endTime,
             @ApiParam(value = "申请开始时间") @RequestParam(required = false) Long applyStartTime,
             @ApiParam(value = "申请结束时间") @RequestParam(required = false) Long applyEndTime,
-//            @ApiParam(value = "角色类型") @RequestParam(required = true) RoleTypeEnum roleType,
+            @ApiParam(value = "角色类型") @RequestParam(required = true) RoleTypeEnum roleType,
             @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
             @ApiParam(value = "页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize)
             throws Exception {
         return ResultUtil.ok(
                 tbDingApplyService.flowTaskUnDoneList(new Page<>(pageNumber, pageSize), serviceId, name, supplierId,
-                        customName, startTime, endTime, applyStartTime, applyEndTime, null));
+                        customName, startTime, endTime, applyStartTime, applyEndTime, roleType));
     }
 
     @ApiOperation(value = "考勤异常已审核接口")
@@ -87,13 +87,13 @@ public class TBDingApplyController {
             @ApiParam(value = "异常结束时间") @RequestParam(required = false) Long endTime,
             @ApiParam(value = "申请开始时间") @RequestParam(required = false) Long applyStartTime,
             @ApiParam(value = "申请结束时间") @RequestParam(required = false) Long applyEndTime,
-//            @ApiParam(value = "角色类型") @RequestParam(required = true) RoleTypeEnum roleType,
+            @ApiParam(value = "角色类型") @RequestParam(required = true) RoleTypeEnum roleType,
             @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
             @ApiParam(value = "页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize)
             throws Exception {
         return ResultUtil.ok(
                 tbDingApplyService.flowTaskDoneList(new Page<>(pageNumber, pageSize), serviceId, name, supplierId,
-                        dingExceptionApprove, customName, startTime, endTime, applyStartTime, applyEndTime, null));
+                        dingExceptionApprove, customName, startTime, endTime, applyStartTime, applyEndTime, roleType));
     }
 
     @ApiOperation(value = "考勤异常审核接口")

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingApplyServiceImpl.java

@@ -183,7 +183,7 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
             }
             supplierId = userSupplierId;
         }
-//        dpr = roleType == RoleTypeEnum.REGION_COORDINATOR ? null : dpr;
+        dpr = roleType == RoleTypeEnum.REGION_COORDINATOR ? null : dpr;
         IPage<DingApplyUnDoneResult> dingApplyUnDoneResultIPage = this.baseMapper.flowTaskUnDoneList(iPage, serviceId,
                 name, supplierId, customName, startTime, endTime, applyStartTime, applyEndTime, dpr);
         if (Objects.nonNull(dingApplyUnDoneResultIPage) && !CollectionUtils.isEmpty(
@@ -258,7 +258,7 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
             }
             supplierId = userSupplierId;
         }
-//        dpr = roleType == RoleTypeEnum.REGION_COORDINATOR ? null : dpr;
+        dpr = roleType == RoleTypeEnum.REGION_COORDINATOR ? null : dpr;
         IPage<DingApplyDoneResult> dingApplyDoneResultIPage = this.baseMapper.flowTaskDoneList(iPage, serviceId, name,
                 supplierId, Objects.nonNull(dingExceptionApprove) ? dingExceptionApprove.name() : null, customName,
                 startTime, endTime, applyStartTime, applyEndTime, dpr);