fix: 项目模块 根据id获取对应模块与子系统
增加非空判断
This commit is contained in:
parent
7f146cd2f5
commit
fa6b524b98
|
@ -393,6 +393,11 @@ public class ProjectController {
|
||||||
@RequestParam Integer id,
|
@RequestParam Integer id,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
if (id == null) {
|
||||||
|
return ResultUtil.error(ErrorCode.ID_NOT_EXIST);
|
||||||
|
}
|
||||||
|
|
||||||
return projectService.projectChildGetById(id, request);
|
return projectService.projectChildGetById(id, request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -419,6 +424,11 @@ public class ProjectController {
|
||||||
@RequestParam Integer childId,
|
@RequestParam Integer childId,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
if (childId == null) {
|
||||||
|
return ResultUtil.error(ErrorCode.ID_NOT_EXIST);
|
||||||
|
}
|
||||||
|
|
||||||
return projectService.projectModuleGetById(childId, request);
|
return projectService.projectModuleGetById(childId, request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -303,6 +303,7 @@ public class MessageServiceImpl implements MessageService {
|
||||||
messageMapper.messageAdd(messageAddVO);
|
messageMapper.messageAdd(messageAddVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加提醒消息
|
* 添加提醒消息
|
||||||
* 系统/模块到期提醒
|
* 系统/模块到期提醒
|
||||||
|
|
|
@ -285,6 +285,11 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
List<ProjectChildDO> projectChildDOList = projectMapper.getAllChildByProjectId(id);
|
List<ProjectChildDO> projectChildDOList = projectMapper.getAllChildByProjectId(id);
|
||||||
|
|
||||||
List<ReturnGetVO> returnGetVOList = new ArrayList<>();
|
List<ReturnGetVO> returnGetVOList = new ArrayList<>();
|
||||||
|
|
||||||
|
if (projectChildDOList.size() == 0) {
|
||||||
|
return ResultUtil.success(returnGetVOList);
|
||||||
|
}
|
||||||
|
|
||||||
for (ProjectChildDO projectChildDO : projectChildDOList) {
|
for (ProjectChildDO projectChildDO : projectChildDOList) {
|
||||||
ReturnGetVO returnGetVO = new ReturnGetVO();
|
ReturnGetVO returnGetVO = new ReturnGetVO();
|
||||||
Processing.copyProperties(projectChildDO, returnGetVO);
|
Processing.copyProperties(projectChildDO, returnGetVO);
|
||||||
|
@ -308,8 +313,15 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse projectModuleGetById(Integer id, HttpServletRequest request) {
|
public BaseResponse projectModuleGetById(Integer id, HttpServletRequest request) {
|
||||||
|
|
||||||
List<ProjectModuleDO> projectModuleDOList = projectMapper.getModuleByChildId(id);
|
List<ProjectModuleDO> projectModuleDOList = projectMapper.getModuleByChildId(id);
|
||||||
|
|
||||||
List<ReturnGetVO> returnGetVOList = new ArrayList<>();
|
List<ReturnGetVO> returnGetVOList = new ArrayList<>();
|
||||||
|
|
||||||
|
if (projectModuleDOList.size() == 0) {
|
||||||
|
return ResultUtil.success(returnGetVOList);
|
||||||
|
}
|
||||||
|
|
||||||
for (ProjectModuleDO projectModuleDO : projectModuleDOList) {
|
for (ProjectModuleDO projectModuleDO : projectModuleDOList) {
|
||||||
ReturnGetVO returnGetVO = new ReturnGetVO();
|
ReturnGetVO returnGetVO = new ReturnGetVO();
|
||||||
Processing.copyProperties(projectModuleDO, returnGetVO);
|
Processing.copyProperties(projectModuleDO, returnGetVO);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user