From b23c297749c4e6a24633d51425efdb17cff68b68 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Fri, 18 Dec 2020 17:30:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=BE=E9=A2=86=E5=AF=BCbu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/app/service/impl/StaffServiceImpl.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 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 053d33bd..bd7f069d 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
@@ -479,17 +479,19 @@ public class StaffServiceImpl extends ServiceImpl<StaffDao, StaffEntity> impleme
             }
             String depId = departmentsStaffRelateEntity.getDepartmentId();
             departManagers.setDepartmentId(depId);//设置返回的部门id
-            List<StaffEntity> staffEntities = null;
-            while(type > 1){
+            List<StaffEntity> staffEntities = new ArrayList<>();
+
+            while(type > 0){
                 //查找父级部门
+                staffEntities = departmentsStaffRelateService.selectLeadersByDepartmentId(depId);
+                if(staffEntities.size() > 0){//如果中间部门没有领导，那么继续找
+                    type--;
+                }
                 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<>());