From 1e46fe84768c711228ec7b6fe48dbf8bc6cee9f9 Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Fri, 19 Apr 2024 13:18:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=AD=90=E6=A8=A1=E5=9D=97=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsl/oa/model/vodata/ProjectWorkAndNameVO.java | 2 -- .../java/com/jsl/oa/services/impl/ModuleServiceImpl.java | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) 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); }