大数据与最优化研究所 1 سال پیش
والد
کامیت
55140ad472
1فایلهای تغییر یافته به همراه8 افزوده شده و 1 حذف شده
  1. 8 1
      src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

+ 8 - 1
src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -3325,7 +3325,14 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         List<MyProcessPageVo> result = new ArrayList<>(historicProcessInstances.size());
         if (processIds.size() > 0) {
 
-            List<WorkflowExtra> workflowExtras = workflowExtraMapper.selectList(Wrappers.lambdaQuery(WorkflowExtra.class).in(WorkflowExtra::getProcessId, processIds).orderByDesc(WorkflowExtra::getStartTime));
+            List<WorkflowExtra> workflowExtras = workflowExtraMapper.selectList(Wrappers.lambdaQuery(WorkflowExtra.class)
+                    .in(WorkflowExtra::getProcessId, processIds)
+                    .and(StrUtil.isNotBlank(dto.getKeyword()),wp -> wp.like(WorkflowExtra::getSchemaName, dto.getKeyword())
+                            .or()
+                            .like(WorkflowExtra::getTaskName, dto.getKeyword())
+                            .or()
+                            .like(WorkflowExtra::getProcessName, dto.getKeyword()))
+                    .orderByDesc(WorkflowExtra::getStartTime));
 
             for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {