|
|
@@ -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) {
|
|
|
|