From 067839c07d6a2233ebbdd5e37133cf06e06c8e0e Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 10 Nov 2020 17:25:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86=E7=BB=84?=
 =?UTF-8?q?=E6=97=B6=E7=9C=8B=E4=B8=8D=E5=88=B0=E6=95=B0=E6=8D=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/flow/service/impl/EvaluationGroupServiceImpl.java  | 3 +++
 .../performance/controller/EvaluationGroupController.java      | 2 +-
 .../resources/mapper/flow/StaffRoleEvaluationGroupMapper.xml   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
index 8d948a00..425f4bd1 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
@@ -138,11 +138,13 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 			//考评组管理
 			List<StaffRole> staffRoles = staffRoleService.selectAllByStaffId(sysUserEntity.getUserId());
 			if(staffRoles.size() == 0){
+				log.info("非绩效管理员登录查询");
 				return null;
 			}
 			List<StaffRoleEvaluationGroup> staffRoleEvaluationGroups =
 					staffRoleEvaluationGroupService.selectStaffRoleEvaluationsGroupByStaffRoles(staffRoles);
 			if(staffRoleEvaluationGroups.size() == 0){
+				log.info("查询的管理组为空");
 				return null;
 			}
 			gIds = new ArrayList<>();
@@ -150,6 +152,7 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 				 ) {
 				if(staffRoleEvaluationGroup.getEvaluationGroupId().longValue() == 0l){//管理所有组
 					gIds = null;
+					log.info("管理所有组");
 					break;
 				}
 				gIds.add(staffRoleEvaluationGroup.getEvaluationGroupId());//管理特定组
diff --git a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
index 87d91ca6..6412221e 100644
--- a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
+++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
@@ -176,7 +176,7 @@ public class EvaluationGroupController extends AbstractController {
                   ) {//去掉已经在管理本组的管理员
                  if(mapIds.containsKey(staffRole.getStaffId())){
                      mapIds.remove(staffRole.getStaffId());
-                 }else{
+                 }else{//删除管理的组信息
                      staffRoleEvaluationGroupService.deleteStaffRoleEvaluationGroupByRoleId(staffRole.getId());
                  }
              }
diff --git a/src/main/resources/mapper/flow/StaffRoleEvaluationGroupMapper.xml b/src/main/resources/mapper/flow/StaffRoleEvaluationGroupMapper.xml
index 7331ba8d..a2ba1c51 100644
--- a/src/main/resources/mapper/flow/StaffRoleEvaluationGroupMapper.xml
+++ b/src/main/resources/mapper/flow/StaffRoleEvaluationGroupMapper.xml
@@ -99,7 +99,7 @@
 
     <select id="selectStaffRoleEvaluationsGroupByStaffRoles" resultType="StaffRoleEvaluationGroup" >
         select * from lz_staff_role_evaluation_group  where is_delete = 0 and
-        id in (
+        role_id in (
         <foreach collection="list" item="item" separator=",">
             #{item.id}
         </foreach>