From 6e8166012e4e5842cfdecd4d318f8f9ec6ac9f4d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 31 三月 2025 09:31:58 +0800
Subject: [PATCH] Merge branch 'dev'
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index 9bef08a..65cbd42 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -1435,6 +1435,10 @@
jumpAndWaitTaskKeys.addAll(runtimeTaskKey);
hisTaskList = hisTaskList.stream().filter(hisTask -> jumpAndWaitTaskKeys.indexOf(hisTask.getTaskDefinitionKey()) == -1).collect(Collectors.toList());
List<String> hisTaskKeys = hisTaskList.stream().map(HistoricTaskInstance::getTaskDefinitionKey).distinct().collect(Collectors.toList());
+
+ if (CollectionUtils.isEmpty(hisTaskKeys)) {
+ return 0L;
+ }
Map<String, HistoricTaskInstance> hisTaskMap = hisTaskList.stream().collect(Collectors.toMap(HistoricTaskInstance::getTaskDefinitionKey, his -> his));
// 鏌ュ嚭鏃堕棿姝ｅ父鐨勪换鍔ey
List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
@@ -1501,6 +1505,11 @@
jumpAndWaitTaskKeys.addAll(runtimeTaskKey);
hisTaskList = hisTaskList.stream().filter(hisTask -> jumpAndWaitTaskKeys.indexOf(hisTask.getTaskDefinitionKey()) == -1).collect(Collectors.toList());
List<String> hisTaskKeys = hisTaskList.stream().map(HistoricTaskInstance::getTaskDefinitionKey).distinct().collect(Collectors.toList());
+
+ if (CollectionUtils.isEmpty(hisTaskKeys)) {
+ result.total(0);
+ return new ArrayList<>();
+ }
Map<String, HistoricTaskInstance> hisTaskMap = hisTaskList.stream().collect(Collectors.toMap(HistoricTaskInstance::getTaskDefinitionKey, his -> his));
// 鏌ュ嚭鏃堕棿姝ｅ父鐨勪换鍔ey
List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
@@ -2049,7 +2058,7 @@
List<String> jumpTaskIds = allJumpTaskList.stream().map(ProcessLog::getTaskId).collect(Collectors.toList());
jumpTaskIds.removeAll(rejectTaskIds);
- if(CollectionUtils.isEmpty(rejectTaskIds)) {
+ if(CollectionUtils.isEmpty(jumpTaskIds)) {
return 0L;
}
List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()
@@ -2104,7 +2113,7 @@
List<String> jumpTaskIds = allJumpTaskList.stream().map(ProcessLog::getTaskId).collect(Collectors.toList());
jumpTaskIds.removeAll(rejectTaskIds);
- if(CollectionUtils.isEmpty(rejectTaskIds)) {
+ if(CollectionUtils.isEmpty(jumpTaskIds)) {
result.total(0l);
return new ArrayList<>();
}
--
Gitblit v1.8.0