From 6b53b91544feddb6d6ee39d423e5e5490f7e1bf6 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, 30 Oct 2020 14:23:14 +0800
Subject: [PATCH] fix

---
 .../flow/dao/EvaluationStartStaffMapper.java        |  2 ++
 .../service/impl/AssessManagerServiceImpl.java      | 13 +++++++++----
 .../mapper/flow/EvaluationStartStaffMapper.xml      |  4 ++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java b/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java
index 297e1830..ce4e07b1 100644
--- a/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java
+++ b/src/main/java/com/lz/modules/flow/dao/EvaluationStartStaffMapper.java
@@ -44,4 +44,6 @@ public interface EvaluationStartStaffMapper extends BaseMapper<EvaluationStartSt
 	int updateBatchToScore(@Param("startId") Long startId,@Param("evaluationId")Long evaluationId);
 
 	int deleteEvaluationStartStaffChangeAssess(@Param("startId") Long startId,@Param("staffIds") List<String> staffIds);
+
+	List<Long> selectStaffIdsByStart(@Param("startId") Long startId);
 }
\ No newline at end of file
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 9f8bdd7e..334b870f 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
@@ -167,20 +167,25 @@ public class AssessManagerServiceImpl implements AssessManagerService {
             //初始化添加用户的数据
             List<GroupStaffs> groupS = new ArrayList<>();
 
+            //排除已发起过的
+            List<Long> longs = evaluationStartStaffMapper.selectStaffIdsByStart(req.getStartId());
+
             for(EvaluationGroup group:evaluationGroups){
+                GroupStaffs groupStaffs = new GroupStaffs();
+                groupStaffs.setEvaluationGroup(group);
+
                 List<String> staffs = map.get(group.getId());
                 staffs.retainAll(notInGroup);
-                map.put(group.getId(),staffs);
-                GroupStaffs groupStaffs = new GroupStaffs();
-                groupStaffs.setGroupId(group.getId());
+
                 List<Long> collect = staffs.stream().map(s -> Long.valueOf(s)).collect(toList());
+                collect.removeAll(longs);
                 groupStaffs.setStaffIds(collect);
                 groupS.add(groupStaffs);
             }
 
             StartGroups startGroups = new StartGroups();
             startGroups.setStartId(req.getStartId());
-            startGroups.setStaffIds(groupS);
+            startGroups.setGroups(groupS);
             flowStartService.startStaffs(startGroups);
             return ok;
 
diff --git a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml
index 487c2e01..f2c8754b 100644
--- a/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml
+++ b/src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml
@@ -163,5 +163,9 @@
         </foreach>
         )
     </update>
+
+    <select id="selectStaffIdsByStart" resultType="long">
+        select staff_id from lz_evaluation_start_staff  where start_id=#{startId}  and is_delete = 0
+    </select>
 </mapper>