diff --git a/src/main/java/com/zh/project0512/controller/manage/TaskController.java b/src/main/java/com/zh/project0512/controller/manage/TaskController.java index 2edd592..527b51e 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java @@ -640,12 +640,12 @@ public class TaskController { if(null !=param.getEndTime()){ qw.le( "date_format(t1.creatAt, '%Y-%m-%d')", param.getEndTime()); } - qw.orderByDesc("effectResultSum"); IPage iPage = taskService.taskEffectDataUserIdPage(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()),qw); List list = iPage.getRecords(); + qw.orderByDesc("effectResultSum"); qw.groupBy("t5.departmentId"); - qw.in("t1.userId",list); if (list.size() > 0) { + qw.in("t1.userId",list); iPage.setRecords(taskService.taskEffectDataPage( qw)); } return Result.success(iPage);