|
@@ -702,6 +702,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
702
|
702
|
if (StringUtils.isNotBlank(queryVo.getName())){
|
703
|
703
|
taskQuery.processDefinitionNameLike(queryVo.getName());
|
704
|
704
|
}
|
|
705
|
+ if (StringUtils.isNotBlank(queryVo.getCategory())){
|
|
706
|
+ taskQuery.processCategoryIn(Collections.singleton(queryVo.getCategory()));
|
|
707
|
+ }
|
705
|
708
|
page.setTotal(taskQuery.count());
|
706
|
709
|
List<Task> taskList = taskQuery.listPage(queryVo.getPageSize() * (queryVo.getPageNum() - 1), queryVo.getPageSize());
|
707
|
710
|
List<FlowTaskDto> flowList = new ArrayList<>();
|
|
@@ -1117,8 +1120,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
1117
|
1120
|
// 获取节点信息
|
1118
|
1121
|
source = flowElement;
|
1119
|
1122
|
List<SequenceFlow> inFlows = FlowableUtils.getElementIncomingFlows(source);
|
1120
|
|
- if (inFlows.size() == 1) {
|
1121
|
|
- FlowElement sourceFlowElement = inFlows.get(0).getSourceFlowElement();
|
|
1123
|
+ for (SequenceFlow inFlow: inFlows) {
|
|
1124
|
+ FlowElement sourceFlowElement = inFlow.getSourceFlowElement();
|
1122
|
1125
|
if (sourceFlowElement instanceof StartEvent) {// 源是开始节点
|
1123
|
1126
|
isStartNode = true;
|
1124
|
1127
|
}
|
|
@@ -1244,7 +1247,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
1244
|
1247
|
result.put("formKeyExist", true);
|
1245
|
1248
|
return AjaxResult.success("", result);
|
1246
|
1249
|
} else {
|
1247
|
|
- result.put("formData", parameters.get("variables"));
|
|
1250
|
+ Map<String, Object> newParameters = JSON.parseObject(JSON.toJSONString(parameters.get("variables")), Map.class);
|
|
1251
|
+ FlowTaskVo flowTaskVo = new FlowTaskVo();
|
|
1252
|
+ flowTaskVo.setTaskId(taskId);
|
|
1253
|
+ newParameters.put("disabled", !((Boolean) checkIsStartUserNode(flowTaskVo).get("data")));
|
|
1254
|
+ result.put("formData", newParameters);
|
1248
|
1255
|
return AjaxResult.success("", result);
|
1249
|
1256
|
}
|
1250
|
1257
|
} else {
|