diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java index 010cbb0..bb87fc0 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java @@ -193,6 +193,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi { //判断当前账号是否是项目专员/负责人 //因为json里面存的是人事id,通过账号找不到,先把账号id转为人事id + Page page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize()); EntityWrapper userLoginEntityWrapper = new EntityWrapper<>(); userLoginEntityWrapper.eq("id_", userId); SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper); @@ -211,7 +212,12 @@ public class ProjectWeeklyController implements ProjectWeeklyApi { projectWeekly1.setId(projectWeeklyFindReq.getId()); if (!StringUtils.isEmpty(projectWeeklyFindReq.getDeptId() != null)) projectWeekly.setDeptId(projectWeeklyFindReq.getDeptId()); - list.addAll(projectWeeklyService.getList(page, projectWeekly1)); + List list1 = projectWeeklyService.getList(page2, projectWeekly1); + if(!ObjectUtils.isEmpty(list1)){ + list.addAll(list1); + page.setTotal(page.getTotal()+page2.getTotal()); + page.setSize(page.getSize()+page2.getSize()); + } } //组装结果集