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 convertTODO(PointAuditRecordDO nextAuditRecord){ List resultList = new ArrayList<>(); List handlerUserIds = JSONObject.parseArray(nextAuditRecord.getHandlerUserIds(), String.class); - for (String userId : handlerUserIds) { + //去重 + List 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 getUserIdsByPositionIds(Pair, List> userIdsAndPositionIds, Map> userIdsMap) { - List userIds = new ArrayList<>(); + Set 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 auditRecordMap){