From 33897beb4676dee2a0bcad44093fda89055fbfc1 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 10 Nov 2020 16:09:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A2=E6=99=92=E9=95=9C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StaffRoleServiceImpl.java    | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 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 29e2ce23..be77aa8a 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
@@ -431,12 +431,12 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
         } else if (RoleEnums.MASTER_PM.getName().equals(staffRole.getDepartmentLevel())) {
             insertPM(staffRole, RoleMenuEnums.MASTER_PM.getType(), staffEntity);
         } else if (RoleEnums.CHILD_PM.getName().equals(staffRole.getDepartmentLevel())) {     //如果是子管理员
-            for (Long evaluationGroupId : evaluationGroupInfoIds) {
-                StaffRoleEvaluationGroup evaluationGroup = new StaffRoleEvaluationGroup();
-                evaluationGroup.setIsSelect(1);
-                evaluationGroup.setRoleId(staffRole.getId());
-                evaluationGroup.setEvaluationGroupId(evaluationGroupId);
-                staffRoleEvaluationGroupService.insertStaffRoleEvaluationGroup(evaluationGroup);
+            if(new Long(0).equals(roleModel.getEvaluationGroupId())){//全部考评组
+                insertStaffRoleEvaluationGroup(staffRole.getId(),0l);
+            }else{///部分考评组
+                for (Long evaluationGroupId : evaluationGroupInfoIds) {
+                    insertStaffRoleEvaluationGroup(staffRole.getId(),evaluationGroupId);
+                }
             }
             if (roleModel.getDepartmentId().equals(DepartmentPMEnums.SELF_DEPARTMENT.getType().toString())) {//如果是自己所在部门
                 departmentInfoIds.clear();
@@ -451,6 +451,7 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
                 staffRoleDepartment.setDepartmentName(departmentsEntity.getDepartmentName());
                 staffRoleDepartmentService.insertStaffRoleDepartment(staffRoleDepartment);
             }
+
             for (Long staffMenuId : selectStaffMenuInfoIdIds) {
                 StaffRoleMenu staffRoleMenu = new StaffRoleMenu();
                 staffRoleMenu.setRoleId(staffRole.getId());
@@ -526,13 +527,19 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
             staffRoleMenuService.insertStaffRoleMenu(staffRoleMenu);
         }
         if (parentId.equals(RoleMenuEnums.MASTER_PM.getType())) { //如果是绩效管理员
-            StaffRoleEvaluationGroup staffRoleEvaluationGroup = new StaffRoleEvaluationGroup();
-            staffRoleEvaluationGroup.setRoleId(staffRole.getId());
-            staffRoleEvaluationGroup.setIsSelect(1);
-            staffRoleEvaluationGroupService.insertStaffRoleEvaluationGroup(staffRoleEvaluationGroup);
+            insertStaffRoleEvaluationGroup(staffRole.getId(),0l);
         }
     }
 
+    public void insertStaffRoleEvaluationGroup(Long roleId,Long evaluationGroupId){
+        StaffRoleEvaluationGroup staffRoleEvaluationGroup = new StaffRoleEvaluationGroup();
+        staffRoleEvaluationGroup.setRoleId(roleId);
+        staffRoleEvaluationGroup.setEvaluationGroupId(evaluationGroupId);
+        staffRoleEvaluationGroup.setIsSelect(1);
+        staffRoleEvaluationGroupService.insertStaffRoleEvaluationGroup(staffRoleEvaluationGroup);
+    }
+
+
     public void getStaffMenuInfo(StaffMenu parent, List<StaffMenu> all) {
         List<StaffMenu> childs = new ArrayList<>();
         for (StaffMenu child : all) {