From 739509181f6cc61bec5a115ca56957e0d8a905a8 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 8 Sep 2020 11:05:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java
index be705ec2..8906ad77 100644
--- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java
+++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java
@@ -80,13 +80,14 @@ public class DepartmentsServiceImpl extends ServiceImpl<DepartmentsDao, Departme
     @Override
     public StaffDepartmentDto selectStaffAllDepartments(String departmentId) {
         StaffDepartmentDto staffDepartmentDto =  departmentsDao.selectStaffAllDepartments(departmentId);
-        if(StringUtil.isEmpty(staffDepartmentDto.getDepartment1())){
+        if (StringUtil.isEmpty(staffDepartmentDto.getDepartment2())){
+            staffDepartmentDto.setDepartment1(staffDepartmentDto.getDepartment3());
+            staffDepartmentDto.setDepartment2(staffDepartmentDto.getDepartment4());
+            staffDepartmentDto.setDepartment3(null);
+        }else if(StringUtil.isEmpty(staffDepartmentDto.getDepartment1())){
             staffDepartmentDto.setDepartment1(staffDepartmentDto.getDepartment2());
             staffDepartmentDto.setDepartment2(staffDepartmentDto.getDepartment3());
             staffDepartmentDto.setDepartment3(staffDepartmentDto.getDepartment4());
-        }else if (StringUtil.isEmpty(staffDepartmentDto.getDepartment2())){
-            staffDepartmentDto.setDepartment1(staffDepartmentDto.getDepartment3());
-            staffDepartmentDto.setDepartment2(staffDepartmentDto.getDepartment4());
         }
         return staffDepartmentDto;
     }