From cdfd58d7bcfc440f3b4c56863d7d4854c884dc2c Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Tue, 27 Dec 2022 15:19:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=20=E4=BC=98=E5=8C=96=E5=8F=AA=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E9=A2=86=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/service/ProjectProcessService.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/ProjectProcessService.java b/src/main/java/cn/palmte/work/service/ProjectProcessService.java index 7cc13a5..ace40f8 100644 --- a/src/main/java/cn/palmte/work/service/ProjectProcessService.java +++ b/src/main/java/cn/palmte/work/service/ProjectProcessService.java @@ -1,6 +1,7 @@ package cn.palmte.work.service; import cn.palmte.work.config.activiti.ActConstant; + import org.springframework.jdbc.core.BatchPreparedStatementSetter; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; @@ -79,18 +80,19 @@ public class ProjectProcessService { List returnValues = new ArrayList<>(); for (Dept dept : level1) { - DeptReturnValue returnValue = createReturnValue(dept); + // 只需要一级领导 + Admin leader = userRepository.getAdminById(dept.getManagerId()); + String leaderName = leader.getRealName(); + DeptReturnValue returnValue = createReturnValue(dept, leaderName); for (Dept dept2 : level2) { - if (Objects.equals(dept2.getParentId(), dept.getId())) { - DeptReturnValue returnValue2 = createReturnValue(dept2); - returnValue.addChildren(returnValue2); - + DeptReturnValue returnValue2 = createReturnValue(dept2, leaderName); for (Dept dept3 : level3) { if (Objects.equals(dept3.getParentId(), dept2.getId())) { - returnValue2.addChildren(createReturnValue(dept3)); + returnValue2.addChildren(createReturnValue(dept3, leaderName)); } } + returnValue.addChildren(returnValue2); } } returnValues.add(returnValue); @@ -108,15 +110,13 @@ public class ProjectProcessService { return ret; } - private DeptReturnValue createReturnValue(Dept dept) { + private DeptReturnValue createReturnValue(Dept dept, String leaderName) { DeptReturnValue returnValue = new DeptReturnValue(); returnValue.setId(dept.getId()); returnValue.setName(dept.getName()); returnValue.setLeaderId(dept.getManagerId()); - - Admin user = userRepository.getAdminById(dept.getManagerId()); - returnValue.setLeaderName(user.getRealName()); + returnValue.setLeaderName(leaderName); return returnValue; }