From 7282fe67c8e5440e6b0c1ae613de1e556084a4ac Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 10 Nov 2020 15:52:38 +0800
Subject: [PATCH 1/2] =?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

---
 .../com/lz/modules/flow/dao/StaffRoleMapper.java  |  2 ++
 .../flow/service/impl/StaffRoleServiceImpl.java   | 15 ++++++++++-----
 .../resources/mapper/flow/StaffRoleMapper.xml     |  7 +++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java b/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java
index e145585e..f98b77b8 100644
--- a/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java
@@ -60,4 +60,6 @@ public interface StaffRoleMapper extends BaseMapper<StaffRole> {
     List<StaffMenu> selectAllMenus(@Param("userId") Long userId);
 
 	List<StaffRole> selectAllStaffRoleByDepartmentLevel(@Param("departmentLevels") List<String> departmentLevels);
+
+	StaffRole selectStaffRolesByStaffIdDepartmentLevelList(@Param("staffId") Long staffId, @Param("departmentLevels") List<String> departmentLevels);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
index ffe69a08..40117b34 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
@@ -37,10 +37,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.lang.reflect.Array;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -411,7 +409,14 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
                 return R.ok("更新成功");
             }
         } else if (roleModel.getStaffId() != null) { // 员工不为空
-            StaffRole data = staffRoleMapper.selectStaffRolesByStaffIdDepartmentLevel(roleModel.getStaffId(), roleModel.getDepartmentLevel());
+            StaffRole data =  null;
+            if(RoleEnums.CHILD_PM.getName().equals(roleModel.getDepartmentLevel()) //如果是主管理员，或者是子管理员，主管理员和子管理员不能同时存在
+                || RoleEnums.MASTER_PM.getName().equals(roleModel.getDepartmentLevel())){
+                data = staffRoleMapper.selectStaffRolesByStaffIdDepartmentLevelList(roleModel.getStaffId(),
+                        Arrays.asList(new String[]{RoleEnums.CHILD_PM.getName(),RoleEnums.MASTER_PM.getName()}));
+            } else {
+                data = staffRoleMapper.selectStaffRolesByStaffIdDepartmentLevel(roleModel.getStaffId(), roleModel.getDepartmentLevel());
+            }
             if (data != null) {
                 return R.error("该管理员己经存在");
             }
diff --git a/src/main/resources/mapper/flow/StaffRoleMapper.xml b/src/main/resources/mapper/flow/StaffRoleMapper.xml
index 8f44cb4f..16bed696 100644
--- a/src/main/resources/mapper/flow/StaffRoleMapper.xml
+++ b/src/main/resources/mapper/flow/StaffRoleMapper.xml
@@ -176,6 +176,13 @@
         </foreach>
     </select>
 
+    <select id="selectStaffRolesByStaffIdDepartmentLevelList"  resultType="com.lz.modules.flow.entity.StaffRole">
+        select * from lz_staff_role where is_delete = 0 and staff_id = #{staffId} and department_level in
+        <foreach collection="departmentLevels" item="item" index="index" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
+
 
 </mapper>
 

From 2644a17d42cd2515b41a14dfa6b945e287c4b73a Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 10 Nov 2020 15:53:04 +0800
Subject: [PATCH 2/2] =?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

---
 .../com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
index 40117b34..29e2ce23 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
@@ -408,7 +408,7 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
                     RoleEnums.MASTER_PM.getName().equals(staffRole.getDepartmentLevel())) {
                 return R.ok("更新成功");
             }
-        } else if (roleModel.getStaffId() != null) { // 员工不为空
+        } else if (roleModel.getStaffId() != null) { // 员工不为空,表示是新增数据
             StaffRole data =  null;
             if(RoleEnums.CHILD_PM.getName().equals(roleModel.getDepartmentLevel()) //如果是主管理员，或者是子管理员，主管理员和子管理员不能同时存在
                 || RoleEnums.MASTER_PM.getName().equals(roleModel.getDepartmentLevel())){