From 95a1e2c9c96ac650df566702ae5fe7f943e11519 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Fri, 18 Dec 2020 17:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=BE=E9=A2=86=E5=AF=BC?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A6=82=E6=9E=9C=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=A2=86=E5=AF=BC=E9=82=A3=E4=B9=88=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=89=BE=E4=B8=8A=E4=B8=80=E7=BA=A7=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/app/service/impl/StaffServiceImpl.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
index cd0f894a..053d33bd 100644
--- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
+++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
@@ -478,22 +478,27 @@ public class StaffServiceImpl extends ServiceImpl<StaffDao, StaffEntity> impleme
                 type++;
             }
             String depId = departmentsStaffRelateEntity.getDepartmentId();
-            departManagers.setDepartmentId(depId);
+            departManagers.setDepartmentId(depId);//设置返回的部门id
+            List<StaffEntity> staffEntities = null;
             while(type > 1){
                 //查找父级部门
                 DepartmentsEntity departmentsEntity =
                         departmentsService.selectParentDepartmentByDepartmentId(depId);
                 if(departmentsEntity != null){
                     depId = departmentsEntity.getDepartmentId();
+                    staffEntities = departmentsStaffRelateService.selectLeadersByDepartmentId(depId);
+                    if(staffEntities.size() > 0){
+                        type--;
+                    }
                 }else{
                     log.info("没有找到父级部门，部门id{}", depId);
                     departManagers.setManagers(new ArrayList<>());
                     return departManagers;
                 }
-                type--;
+
             }
-            List<StaffEntity> staffEntities =
-                    departmentsStaffRelateService.selectLeadersByDepartmentId(depId);
+            /*List<StaffEntity> staffEntities =
+                    departmentsStaffRelateService.selectLeadersByDepartmentId(depId);*/
             departManagers.setManagers(staffEntities);
             if(staffEntities.size() == 0){
                 log.info("无法找到管理人员.部门id{}", depId);