|
@@ -191,9 +191,14 @@ public class FlowTaskService {
|
|
|
if (act.getEndDate () != null) {
|
|
|
histTaskQuery.taskCompletedBefore (act.getEndDate ());
|
|
|
}
|
|
|
- if (act.getTitle () != null) {
|
|
|
+ if (StrUtil.isNotBlank (act.getTitle ())) {
|
|
|
+ // 实例标题
|
|
|
histTaskQuery.processVariableValueLike (FlowableConstant.TITLE, "%" + act.getTitle () + "%");
|
|
|
}
|
|
|
+ if (StrUtil.isNotBlank (act.getApplyUserId())) {
|
|
|
+ // 流程发起人
|
|
|
+ histTaskQuery.processVariableValueEquals (FlowableConstant.INITIATOR, act.getApplyUserId ());
|
|
|
+ }
|
|
|
|
|
|
// 查询总数
|
|
|
page.setTotal (histTaskQuery.count ());
|
|
@@ -360,6 +365,10 @@ public class FlowTaskService {
|
|
|
if (StrUtil.isNotBlank (flow.getTitle ())) {
|
|
|
query.variableValueLike (FlowableConstant.TITLE, "%" + flow.getTitle () + "%");
|
|
|
}
|
|
|
+ if (StrUtil.isNotBlank (flow.getApplyUserId())) {
|
|
|
+ // 流程发起人
|
|
|
+ query.variableValueEquals (FlowableConstant.INITIATOR, flow.getApplyUserId ());
|
|
|
+ }
|
|
|
|
|
|
page.setTotal (query.count ());
|
|
|
List<HistoricProcessInstance> histList;
|