xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-30 23:26:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 修复任务，流程实例分页模糊查询失效

Browse Source
This commit is contained in:
songgaoshuai 2023-06-09 14:07:24 +08:00
parent 11643253a0
commit 4d63888080
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
View File

@ -5,6 +5,7 @@ import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.helper.TenantHelper;
@ -94,7 +95,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
.orderByProcessInstanceEndTime().desc(); .orderByProcessInstanceEndTime().desc();
query.processInstanceTenantId(TenantHelper.getTenantId()); query.processInstanceTenantId(TenantHelper.getTenantId());
if (StringUtils.isNotEmpty(processInstanceBo.getName())) { if (StringUtils.isNotEmpty(processInstanceBo.getName())) {
query.processInstanceNameLike(processInstanceBo.getName()); query.processInstanceNameLikeIgnoreCase("%" + processInstanceBo.getName() + "%");
} }
if (StringUtils.isNotEmpty(processInstanceBo.getStartUserId())) { if (StringUtils.isNotEmpty(processInstanceBo.getStartUserId())) {
query.startedBy(processInstanceBo.getStartUserId()); query.startedBy(processInstanceBo.getStartUserId());
@ -160,7 +161,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
} }
List<String> highLightedNodeList = new ArrayList<>(); List<String> highLightedNodeList = new ArrayList<>();
//运行中的节点 //运行中的节点
List<String> redNodeCollect = highLightedNodes.stream().filter(e -> e.contains(Color.RED.toString())).toList(); List<String> redNodeCollect = StreamUtils.filter(highLightedNodes, e -> e.contains(Color.RED.toString()));
//排除与运行中相同的节点 //排除与运行中相同的节点
for (String nodeId : highLightedNodes) { for (String nodeId : highLightedNodes) {
if (!nodeId.contains(Color.RED.toString()) && !redNodeCollect.contains(Color.RED + nodeId)) { if (!nodeId.contains(Color.RED.toString()) && !redNodeCollect.contains(Color.RED + nodeId)) {

4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
View File

@ -138,7 +138,7 @@ public class ActTaskServiceImpl implements IActTaskService {
query.taskCandidateGroupIn(groupIds); query.taskCandidateGroupIn(groupIds);
} }
if (StringUtils.isNotBlank(taskBo.getName())) { if (StringUtils.isNotBlank(taskBo.getName())) {
query.taskNameLike(taskBo.getName()); query.taskNameLike("%" + taskBo.getName() + "%");
} }
List<Task> taskList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize()); List<Task> taskList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize());
List<TaskVo> list = new ArrayList<>(); List<TaskVo> list = new ArrayList<>();
@ -160,7 +160,7 @@ public class ActTaskServiceImpl implements IActTaskService {
HistoricTaskInstanceQuery query = historyService.createHistoricTaskInstanceQuery() HistoricTaskInstanceQuery query = historyService.createHistoricTaskInstanceQuery()
.taskAssignee(userId).taskTenantId(TenantHelper.getTenantId()).finished().orderByHistoricTaskInstanceStartTime().asc(); .taskAssignee(userId).taskTenantId(TenantHelper.getTenantId()).finished().orderByHistoricTaskInstanceStartTime().asc();
if (StringUtils.isNotBlank(taskBo.getName())) { if (StringUtils.isNotBlank(taskBo.getName())) {
query.taskNameLike(taskBo.getName()); query.taskNameLike("%" + taskBo.getName() + "%");
} }
List<HistoricTaskInstance> taskInstanceList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize()); List<HistoricTaskInstance> taskInstanceList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize());
List<TaskVo> list = new ArrayList<>(); List<TaskVo> list = new ArrayList<>();