From f1d813efa7f52f51808413ebf76f518cded6d08a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Sun, 26 May 2024 16:27:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/entity/PointAuditRecordDO.java   | 9 +++++----
 .../com/cool/store/service/impl/PointServiceImpl.java    | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/PointAuditRecordDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/PointAuditRecordDO.java
index 47ee4c0d6..f8744e788 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/PointAuditRecordDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/PointAuditRecordDO.java
@@ -5,9 +5,8 @@ import com.cool.store.enums.AuditStatusEnum;
 import com.cool.store.enums.NodeNoEnum;
 import lombok.Data;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 import javax.persistence.*;
 
 @Data
@@ -120,7 +119,9 @@ public class PointAuditRecordDO {
     public static List<PointTodoInfoDO> convertTODO(PointAuditRecordDO nextAuditRecord){
         List<PointTodoInfoDO> resultList = new ArrayList<>();
         List<String> handlerUserIds = JSONObject.parseArray(nextAuditRecord.getHandlerUserIds(), String.class);
-        for (String userId : handlerUserIds) {
+        //去重
+        List<String> finalHandlerUserIds = new ArrayList<>(new HashSet<>(handlerUserIds));
+        for (String userId : finalHandlerUserIds) {
             PointTodoInfoDO todo = new PointTodoInfoDO();
             todo.setPointId(nextAuditRecord.getPointId());
             todo.setNodeNo(nextAuditRecord.getNodeNo());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
index f2a4c97f0..aa3d37430 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
@@ -1108,7 +1108,7 @@ public class PointServiceImpl implements PointService {
      * @return
      */
     private List<String> getUserIdsByPositionIds(Pair<List<String>, List<String>> userIdsAndPositionIds, Map<String, List<String>> userIdsMap) {
-        List<String> userIds = new ArrayList<>();
+        Set<String> userIds = new HashSet<>();
         if(CollectionUtils.isNotEmpty(userIdsAndPositionIds.getKey())){
             userIds.addAll(userIdsAndPositionIds.getKey());
         }
@@ -1120,7 +1120,7 @@ public class PointServiceImpl implements PointService {
                 }
             });
         }
-        return userIds;
+        return new ArrayList<>(userIds);
     }
 
     private PointAuditRecordDO getNextAuditRecord(Integer currentNodeNo, Map<Integer, PointAuditRecordDO> auditRecordMap){