diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index 2c98673..334895e 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -393,6 +393,11 @@ public class ProjectController { @RequestParam Integer id, HttpServletRequest request ) { + + if (id == null) { + return ResultUtil.error(ErrorCode.ID_NOT_EXIST); + } + return projectService.projectChildGetById(id, request); } @@ -419,6 +424,11 @@ public class ProjectController { @RequestParam Integer childId, HttpServletRequest request ) { + + if (childId == null) { + return ResultUtil.error(ErrorCode.ID_NOT_EXIST); + } + return projectService.projectModuleGetById(childId, request); } diff --git a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java index 41377ca..ef6f2dc 100644 --- a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java @@ -303,6 +303,7 @@ public class MessageServiceImpl implements MessageService { messageMapper.messageAdd(messageAddVO); } + /** * 添加提醒消息 * 系统/模块到期提醒 diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java index 58f1cc6..3b4a3a3 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -285,6 +285,11 @@ public class ProjectServiceImpl implements ProjectService { List projectChildDOList = projectMapper.getAllChildByProjectId(id); List returnGetVOList = new ArrayList<>(); + + if (projectChildDOList.size() == 0) { + return ResultUtil.success(returnGetVOList); + } + for (ProjectChildDO projectChildDO : projectChildDOList) { ReturnGetVO returnGetVO = new ReturnGetVO(); Processing.copyProperties(projectChildDO, returnGetVO); @@ -308,8 +313,15 @@ public class ProjectServiceImpl implements ProjectService { @Override public BaseResponse projectModuleGetById(Integer id, HttpServletRequest request) { + List projectModuleDOList = projectMapper.getModuleByChildId(id); + List returnGetVOList = new ArrayList<>(); + + if (projectModuleDOList.size() == 0) { + return ResultUtil.success(returnGetVOList); + } + for (ProjectModuleDO projectModuleDO : projectModuleDOList) { ReturnGetVO returnGetVO = new ReturnGetVO(); Processing.copyProperties(projectModuleDO, returnGetVO);