|
|
@@ -47,6 +47,8 @@ public class WorkbenchManage { |
|
|
|
|
|
|
|
private final UserInfoHelper userInfoHelper; |
|
|
|
|
|
|
|
private final ProjectLibManage projectLibManage; |
|
|
|
|
|
|
|
public WorkbenchVO getWorkbenchData(Integer year){ |
|
|
|
UserInfoDetails userInfo = LoginUserUtil.loginUserDetail(); |
|
|
|
WorkbenchVO res = new WorkbenchVO(); |
|
|
@@ -69,7 +71,7 @@ public class WorkbenchManage { |
|
|
|
projectListReq.setPageNumber(1); |
|
|
|
projectListReq.setPageSize(5); |
|
|
|
projectListReq.setProjectYear(year); |
|
|
|
res.setProjects(declaredProjectManage.projectLibList(projectListReq).getRecords().stream().collect(Collectors.toList())); |
|
|
|
res.setProjects(projectLibManage.projectLibListWithPermission(projectListReq).getRecords().stream().collect(Collectors.toList())); |
|
|
|
|
|
|
|
//3.所有公告按类型分 |
|
|
|
NoticeListReq noticeListReq = new NoticeListReq(); |
|
|
|