From 1d07f2098f90e534a9442eb23383a9a515733ed9 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 17 Nov 2020 11:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EvaluationGroupServiceImpl.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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 3aa63b51..941867bb 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
@@ -143,13 +143,14 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 				log.info("非绩效管理员登录查询");
 				return null;
 			}
-			List<StaffRoleEvaluationGroup> staffRoleEvaluationGroups =
-					staffRoleEvaluationGroupService.selectStaffRoleEvaluationsGroupByStaffRoles(staffRoles);
-			if(staffRoleEvaluationGroups.size() == 0){
-				log.info("查询的管理组为空");
-				return null;
-			}
-			if(staffRoleEvaluationGroups.get(0).getEvaluationGroupId().longValue() != 0L){//管理指定考评组的
+			if(staffRoles.get(0).getEvaluationGroupId().longValue() != 0L){//管理指定考评组的
+				List<StaffRoleEvaluationGroup> staffRoleEvaluationGroups =
+						staffRoleEvaluationGroupService.selectStaffRoleEvaluationsGroupByStaffRoles(staffRoles);
+				if(staffRoleEvaluationGroups.size() == 0){
+					log.info("查询的管理组为空");
+					return null;
+				}
+
 				gIds = new ArrayList<>();
 				for (StaffRoleEvaluationGroup staffRoleEvaluationGroup:staffRoleEvaluationGroups
 				) {