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 d25954e..fd0116d 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java @@ -92,6 +92,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi { public String list(@RequestHeader("userId") Long userId, @RequestBody ProjectWeeklyFindReq projectWeeklyFindReq) throws XQException { try { if (!ObjectUtils.isEmpty(projectWeeklyFindReq)) { + if(!ObjectUtils.isEmpty(userId)) projectWeeklyFindReq.setUserId(String.valueOf(userId)); if (projectWeeklyFindReq.getPageNo() == null || projectWeeklyFindReq.getPageNo() == 0) { projectWeeklyFindReq.setPageNo(1); } @@ -104,6 +105,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi { projectWeekly.setIsDeleted("0"); projectWeekly.setUserId(String.valueOf(userId)); projectWeekly.setWeeklyType("0"); + List list = projectWeeklyService.getList(page, projectWeekly); ProjectWeeklyListResp listResp = new ProjectWeeklyListResp(); listResp.setLs(list);