Bläddra i källkod

获取已办任务列表接口修改

chenshudong 4 månader sedan
förälder
incheckning
e485a23599

+ 9 - 1
airport-system/src/main/java/com/sundot/airport/system/service/approval/impl/ApprovalEngineServiceImpl.java

@@ -322,7 +322,15 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
322 322
     @Override
323 323
     public List<ApprovalTask> getUserCompletedTasks(Long userId) {
324 324
         return taskMapper.selectApprovalTaskByAssignee(userId, null)
325
-                .stream().filter(task -> !"PENDING".equals(task.getStatus())).collect(Collectors.toList());
325
+                .stream().filter(task -> !"PENDING".equals(task.getStatus()))
326
+                .collect(Collectors.toMap(
327
+                        item -> Arrays.asList(item.getInstanceId(), item.getNodeId()), // 组合键
328
+                        item -> item,
329
+                        (existing, replacement) -> existing // 冲突时保留已存在的(第一个)
330
+                ))
331
+                .values()
332
+                .stream()
333
+                .collect(Collectors.toList());
326 334
     }
327 335
 
328 336
     /**