From 55819f6adb25e414ab69f95d73588b8029e83a9a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 07 二月 2025 17:44:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 d7beadb..7591ebb 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -305,6 +305,8 @@
if (Objects.nonNull(project)) {
taskVO.setProjectId(project.getId());
taskVO.setProjectName(project.getProjectName());
+ } else {
+ continue;
}
// 娴佺▼鍙戣捣浜轰俊鎭�
@@ -363,6 +365,9 @@
taskVO.setHandlerUnitId(handlerUnitIds);
taskVO.setHandlerUnitName(handlerUnitNames);
vos.add(taskVO);
+ }
+ if (vos.size() < pageSize) {
+ result.total(vos.size());
}
result.put("taskList", vos);
}
@@ -471,7 +476,7 @@
for (FlowElement flowElement : flowElements) {
if (flowElement instanceof UserTask && flowElement.getId().equals(task.getTaskDefinitionKey())) {
UserTask userTask = (UserTask) flowElement;
- needAuditing = taskCommonService.checkTaskNeedAuditing(userTask.getExtensionElements().get("properties"));
+ needAuditing = taskCommonService.checkHasExeProperty(userTask.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_NEED_AUDITING_TEXT);
break;
}
--
Gitblit v1.8.0