WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug:子模块子系统查询，添加bug修复 #30

Merged
XiaoLFeng merged 5 commits from feature-jie into develop 2024-04-19 19:15:35 +08:00
Conversation 0 Commits 5 Files Changed 11 +1 -7
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1e46fe8476 - Show all commits

2
src/main/java/com/jsl/oa/model/vodata/ProjectWorkAndNameVO.java
View File

@ -15,11 +15,9 @@ import java.sql.Timestamp;
public class ProjectWorkAndNameVO {
private Long id;
private String childSystemName;
private Long projectChildId;
private Long principalId;
private String principalUser;
private Integer cycle;
private Integer workLoad;
private String name;
private String description;

6
src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java
View File

@ -76,12 +76,8 @@ public class ModuleServiceImpl implements ModuleService {
ProjectWorkAndNameVO projectWorkAndNameVO = new ProjectWorkAndNameVO();
Processing.copyProperties(projectWorkDO, projectWorkAndNameVO);
// 添加负责人和子系统名称
projectWorkAndNameVO.
setChildSystemName(projectDAO.getProjectWorkerById(projectWorkDO.getProjectChildId()).getName())
.setPrincipalUser(userDAO.getUserById(projectWorkDO.getPrincipalId()).getUsername());
projectWorkAndNameVO.setPrincipalUser(userDAO.getUserById(projectWorkDO.getPrincipalId()).getUsername());
projectWorkAndNameVOS.add(projectWorkAndNameVO);
}
return ResultUtil.success(projectWorkAndNameVOS);
}