xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.周报分页修改

Browse Source
This commit is contained in:
zty 2024-07-30 16:12:33 +08:00
parent b3293196fc
commit c4fa4f1d46
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
View File

@ -193,6 +193,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
//判断当前账号是否是项目专员/负责人
//因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id
Page<ProjectWeekly> page2 = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
EntityWrapper<SystemUserLogin> 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<ProjectWeeklyDto> list1 = projectWeeklyService.getList(page2, projectWeekly1);
if(!ObjectUtils.isEmpty(list1)){
list.addAll(list1);
page.setTotal(page.getTotal()+page2.getTotal());
page.setSize(page.getSize()+page2.getSize());
}
}
//组装结果集