From 9dd1b91771c7e75d532f868fe1c1b61bc86ae903 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 11 Nov 2020 16:54:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=92=E5=85=A5=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E7=BB=A9=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lz/modules/flow/service/EvaluationGroupService.java  | 1 +
 .../flow/service/impl/EvaluationGroupServiceImpl.java        | 5 +++++
 .../lz/modules/flow/service/impl/FlowStartServiceImpl.java   | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java
index 3e3a4513..2a6c15d4 100644
--- a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java
+++ b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java
@@ -58,4 +58,5 @@ public interface EvaluationGroupService extends IService<EvaluationGroup> {
 
 	String getEvaluationCopyIdsByEvaluationIds(String evaluationIds,Long startId);
 
+    EvaluationGroup selectEvaluationGroupByCopyId(Long copyId, Long startId);
 }
\ No newline at end of file
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 7dd6d7ee..fcd7b045 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
@@ -402,4 +402,9 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 		}
 		return StringUtils.join(ids,",");
 	}
+
+	@Override
+	public EvaluationGroup selectEvaluationGroupByCopyId(Long copyId, Long startId){
+		return evaluationGroupMapper.selectEvaluationGroupByCopyId(copyId, startId);
+	}
 }
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 d4abcd7e..fee3f5bf 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
@@ -149,7 +149,8 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 				log.info("无有效考核人员");
 				R.error(groupStaffs.getEvaluationGroup().getName() + "——无有效考核人员");
 			}
-			switch (start(groupStaffs.getEvaluationGroup(), flowStart, staffManages, staffSimpleInfos, mustRole, selfMustRole)){
+			EvaluationGroup evaluationGroup = evaluationGroupService.selectEvaluationGroupByCopyId(groupStaffs.getEvaluationGroup().getId(),flowStart.getId());
+			switch (start(evaluationGroup, flowStart, staffManages, staffSimpleInfos, mustRole, selfMustRole)){
 
 				case 1:
 					return R.error(groupStaffs.getEvaluationGroup().getName() + "——没有设置考核模板");