diff --git a/src/main/java/com/jsl/oa/model/vodata/ProjectWorkAndNameVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectWorkAndNameVO.java index 6c28b64..d09eaf1 100644 --- a/src/main/java/com/jsl/oa/model/vodata/ProjectWorkAndNameVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectWorkAndNameVO.java @@ -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; diff --git a/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java index 7ba389b..34f0828 100644 --- a/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java @@ -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); }