From 55e85185145187b56970b6117d3c634f019006c6 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Fri, 18 Nov 2022 16:53:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=AF=E8=A7=86=E5=8C=96?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CompanyServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java index 369ab1d0..54b4f96f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java @@ -239,7 +239,14 @@ public class CompanyServiceImpl implements CompanyService { @Override public Object call() throws Exception { List childForMaterialTypeByParent = findChildForMaterialTypeByParent(ap,userByPort); - Map stringObjectMap = InitTreeMenus(ap,childForMaterialTypeByParent); + Map stringObjectMap = null; + if(childForMaterialTypeByParent == null){ + List objectList = addDepartMentHead(ap, userByPort); + stringObjectMap = InitTreeMenus(ap,objectList); + }else{ + stringObjectMap = InitTreeMenus(ap,childForMaterialTypeByParent); + } + return stringObjectMap; } } @@ -330,9 +337,10 @@ public class CompanyServiceImpl implements CompanyService { List DepartmentHeads = new ArrayList<>(); for (int i = 0; i < list.size(); i++) { UserByPort userByPort = JSONObject.toJavaObject((JSONObject) list.get(i), UserByPort.class); - if(userByPort.getPersonincharge() == 1){ + /*if(userByPort.getPersonincharge() == 1){ + DepartmentHeads.add(userByPort); + }*/ DepartmentHeads.add(userByPort); - } } return DepartmentHeads; }