From d03e2d998ffc0872893792a1e98bd9d44c386759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Fri, 13 Nov 2020 11:25:13 +0800
Subject: [PATCH] fix

---
 .../java/com/lz/modules/flow/dao/EvaluationGroupMapper.java   | 2 +-
 .../com/lz/modules/flow/service/EvaluationGroupService.java   | 2 +-
 .../modules/flow/service/impl/EvaluationGroupServiceImpl.java | 4 ++--
 .../performance/service/impl/AssessManagerServiceImpl.java    | 3 ++-
 src/main/resources/mapper/flow/EvaluationGroupMapper.xml      | 1 +
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java
index 2f6db09b..a205681f 100644
--- a/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java
@@ -43,7 +43,7 @@ public interface EvaluationGroupMapper extends BaseMapper<EvaluationGroup> {
 
     EvaluationGroup selectEvaluationGroupByName(@Param("name") String name);
 
-	void deleteByCopyIds(@Param("ids") List<Long> ids);
+	void deleteByCopyIds(@Param("ids") List<Long> ids,@Param("startId")Long startId);
 
 	List<Long> selectIdsByCopyIds(@Param("copyIds")String copyIds,@Param("startId")Long startId);
 
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 2a6c15d4..f3dc5de4 100644
--- a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java
+++ b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java
@@ -52,7 +52,7 @@ public interface EvaluationGroupService extends IService<EvaluationGroup> {
 	//获取考核组里面所有参与的人员信息，去除重复，去除离职
 	List<StaffSimpleInfo> selectAllStaffSimpleInfoByGroupId(EvaluationGroup evaluationGroup);
 
-	void deleteByCopyIds(List<Long> ids);
+	void deleteByCopyIds(List<Long> ids,Long startId);
 
 	R checkStaff(CheckStaffReq checkStaffReq);
 
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 4e82a9cd..d8966a2f 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
@@ -311,8 +311,8 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 
 
 	@Override
-	public void deleteByCopyIds(List<Long> ids) {
-		evaluationGroupMapper.deleteByCopyIds(ids);
+	public void deleteByCopyIds(List<Long> ids,Long startId) {
+		evaluationGroupMapper.deleteByCopyIds(ids,startId);
 	}
 
 
diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
index 938b61b2..93302d3f 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
@@ -174,7 +174,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
             List<String> ids = Arrays.asList(split);
             List<Long> collect = ids.stream().map(s -> Long.valueOf(s)).collect(toList());
             //删除副本组
-            evaluationGroupService.deleteByCopyIds(collect);
+            evaluationGroupService.deleteByCopyIds(collect,flowStart.getId());
         }
         resultRecordMapper.batchDeleteByStartId(flowStart.getId());
         return ;
@@ -260,6 +260,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
             StartGroups startGroups = new StartGroups();
             startGroups.setStartId(req.getStartId());
             startGroups.setGroups(groupS);
+            log.info("添加人员初始化请求：" + JSON.toJSONString(startGroups));
             R r = flowStartService.startStaffs(startGroups);
             log.info("添加人员初始化返回：" + JSON.toJSONString(r));
             return r;
diff --git a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml
index 360bc4e6..82c3279b 100644
--- a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml
+++ b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml
@@ -141,6 +141,7 @@
 
     <update id="deleteByCopyIds">
         update lz_evaluation_group set is_delete = 1 where is_delete=0
+        and start_id = #{startId}
         and copy_id in (
         <foreach collection="ids" item="id" separator=",">
             #{id}