From 49b5ded432324c09225b4a593d0c30bff150bf29 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 3 Nov 2020 17:46:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E8=B5=B7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/service/impl/FlowStartServiceImpl.java   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
index 476bcc3f..f016bc44 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
@@ -204,9 +204,13 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 			EvaluationGroup evaluationGroup = evaluationGroups.get(n);
 			//下面初始化员工考核流程
 			List<StaffSimpleInfo> staffIds = evaluationGroupService.selectAllStaffSimpleInfoByGroupId(evaluationGroup);
+			if(staffIds.size() == 0){
+				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚
 
+				return R.error(evaluationGroup.getName() + "——无有效考核人员");
+			}
 			if(flowStart.getIsDelete() != null){//已经发起过的
-				//下面去调已经发起的用户
+				//下面去掉已经发起的用户
 				List<Long> longs = evaluationStartStaffService.selectStaffIdsByStartAndStaffId(flowStart.getId(), staffIds);
 				if(longs.size() > 0){
 					Map<Long, StaffSimpleInfo> map
@@ -216,15 +220,16 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 						map.remove(key);
 					}
 					staffIds = map.values().stream().collect(Collectors.toList());
+
+					if(staffIds.size() == 0){
+						return R.error(evaluationGroup.getName() + "——本次发起参与人员为0");
+					}
 				}
+
 			}
 
 
-			if(staffIds.size() == 0){
-				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚
 
-				return R.error(evaluationGroup.getName() + "——无有效考核人员");
-			}
 			switch (start(evaluationGroup, flowStart, staffManages, staffIds, mustRole, selfMustRole)){
 
 				case 1: