From 4d63888080005384b9f34092e0613e4e723da3a1 Mon Sep 17 00:00:00 2001 From: songgaoshuai <1742057357@qq.com> Date: Fri, 9 Jun 2023 14:07:24 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/service/impl/ActProcessInstanceServiceImpl.java | 5 +++-- .../dromara/workflow/service/impl/ActTaskServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java index 080302321..5517d07bc 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java @@ -5,6 +5,7 @@ import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.apache.commons.io.IOUtils; +import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.tenant.helper.TenantHelper; @@ -94,7 +95,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService .orderByProcessInstanceEndTime().desc(); query.processInstanceTenantId(TenantHelper.getTenantId()); if (StringUtils.isNotEmpty(processInstanceBo.getName())) { - query.processInstanceNameLike(processInstanceBo.getName()); + query.processInstanceNameLikeIgnoreCase("%" + processInstanceBo.getName() + "%"); } if (StringUtils.isNotEmpty(processInstanceBo.getStartUserId())) { query.startedBy(processInstanceBo.getStartUserId()); @@ -160,7 +161,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService } List highLightedNodeList = new ArrayList<>(); //运行中的节点 - List redNodeCollect = highLightedNodes.stream().filter(e -> e.contains(Color.RED.toString())).toList(); + List redNodeCollect = StreamUtils.filter(highLightedNodes, e -> e.contains(Color.RED.toString())); //排除与运行中相同的节点 for (String nodeId : highLightedNodes) { if (!nodeId.contains(Color.RED.toString()) && !redNodeCollect.contains(Color.RED + nodeId)) { diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java index e21fccae9..32d413f0e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java @@ -138,7 +138,7 @@ public class ActTaskServiceImpl implements IActTaskService { query.taskCandidateGroupIn(groupIds); } if (StringUtils.isNotBlank(taskBo.getName())) { - query.taskNameLike(taskBo.getName()); + query.taskNameLike("%" + taskBo.getName() + "%"); } List taskList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize()); List list = new ArrayList<>(); @@ -160,7 +160,7 @@ public class ActTaskServiceImpl implements IActTaskService { HistoricTaskInstanceQuery query = historyService.createHistoricTaskInstanceQuery() .taskAssignee(userId).taskTenantId(TenantHelper.getTenantId()).finished().orderByHistoricTaskInstanceStartTime().asc(); if (StringUtils.isNotBlank(taskBo.getName())) { - query.taskNameLike(taskBo.getName()); + query.taskNameLike("%" + taskBo.getName() + "%"); } List taskInstanceList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize()); List list = new ArrayList<>();