From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java b/src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java
index c72948f..cd0378a 100644
--- a/src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java
+++ b/src/main/java/org/springblade/flow/engine/service/impl/FlowEngineServiceImpl.java
@@ -97,7 +97,7 @@
}
@Override
- public IPage<FlowProcess> selectProcessPage(IPage<FlowProcess> page, String category, Integer mode) {
+ public IPage<FlowProcess> selectProcessPage(IPage<FlowProcess> page, String category, String name, Integer mode) {
ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery().latestVersion().orderByProcessDefinitionKey().asc();
// 通用流程
if (mode == FlowModeEnum.COMMON.getMode()) {
@@ -109,6 +109,9 @@
}
if (StringUtils.isNotEmpty(category)) {
processDefinitionQuery.processDefinitionCategory(category);
+ }
+ if (StringUtils.isNotEmpty(name)) {
+ processDefinitionQuery.processDefinitionName(name);
}
List<ProcessDefinition> processDefinitionList = processDefinitionQuery.listPage(Func.toInt((page.getCurrent() - 1) * page.getSize()), Func.toInt(page.getSize()));
List<FlowProcess> flowProcessList = new ArrayList<>();
@@ -201,7 +204,7 @@
User user = UserCache.getUser(TaskUtil.getUserId(taskUser));
if (user != null) {
flow.setAssignee(historicActivityInstance.getAssignee());
- flow.setAssigneeName(user.getName());
+ flow.setAssigneeName(user.getRealName());
}
}
}
@@ -211,7 +214,7 @@
User user = UserCache.getUser(TaskUtil.getUserId(historicActivityInstance.getAssignee()));
if (user != null) {
flow.setAssignee(historicActivityInstance.getAssignee());
- flow.setAssigneeName(user.getName());
+ flow.setAssigneeName(user.getRealName());
}
}
// 获取意见评论内容
--
Gitblit v1.9.3