From e32c867e10cb7f265eb4fa5fca84f4622e28435b Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 20 Nov 2020 17:13:24 +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/flow/service/impl/StaffRoleServiceImpl.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 8ac106f1..63cadd28 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
@@ -424,16 +424,17 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
             staffRole = new StaffRole();
             com.lz.modules.app.utils.BeanUtils.copyProperty(staffRole, roleModel);
             staffRole.setStaffName(staffEntity.getName());
+
+            StaffRole masterPM = staffRoleMapper.selectStaffRolesByStaffIdDepartmentLevelList(roleModel.getStaffId(), Arrays.asList(new String[]{RoleEnums.MASTER_PM.getName()}));
+            if(masterPM !=null){
+                return R.error("主管理员只能设置一个,如果想添加，只能更改管理员。");
+            }
             staffRoleMapper.insertStaffRole(staffRole);
         }
 
         if (RoleEnums.BOSS.getName().equals(staffRole.getDepartmentLevel())) {
             insertPM(staffRole, RoleMenuEnums.BOSS.getType(), staffEntity);
         } else if (RoleEnums.MASTER_PM.getName().equals(staffRole.getDepartmentLevel())) {
-            StaffRole masterPM = staffRoleMapper.selectStaffRolesByStaffIdDepartmentLevelList(roleModel.getStaffId(), Arrays.asList(new String[]{RoleEnums.MASTER_PM.getName()}));
-            if(masterPM !=null){
-                return R.error("主管理员只能设置一个,请更改主管理员。");
-            }
             insertPM(staffRole, RoleMenuEnums.MASTER_PM.getType(), staffEntity);
         } else if (RoleEnums.CHILD_PM.getName().equals(staffRole.getDepartmentLevel())) {     //如果是子管理员
             if(new Long(0).equals(roleModel.getEvaluationGroupId())){//全部考评组