Browse Source

完善

master
yxt_djz 3 years ago
parent
commit
2f4f3ec0be
  1. 12
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java
  2. 2
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

12
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java

@ -88,12 +88,18 @@ public class FlowTaskController implements FlowTaskFeign {
int size = Integer.valueOf(businessTaskQuery.getSize() + ""); int size = Integer.valueOf(businessTaskQuery.getSize() + "");
int current = Integer.valueOf(businessTaskQuery.getCurrent() + ""); int current = Integer.valueOf(businessTaskQuery.getCurrent() + "");
List<BusinessTaskParam> fields = businessTaskQuery.getParams().getFields(); List<BusinessTaskParam> fields = businessTaskQuery.getParams().getFields();
AtomicReference<String> orgPath= new AtomicReference<>(""); /* AtomicReference<String> orgPath= new AtomicReference<>("");
fields.forEach(f->{ fields.forEach(f->{
if(f.getField().equals(BusinessVariables.ORGPATH)) if(f.getField().equals(BusinessVariables.ORGPATH))
orgPath.set(f.getValue()); orgPath.set(f.getValue());
}); });*/
ResultBean<Page<FlowTaskDto>> resultBean = flowTaskService.businessTodoList(userSid, orgPath.get(), fields, current, size); String orgPath=null;
for(BusinessTaskParam b: fields){
if(b.getField().equals(BusinessVariables.ORGPATH)) {
orgPath=b.getValue();
}
}
ResultBean<Page<FlowTaskDto>> resultBean = flowTaskService.businessTodoList(userSid, orgPath, fields, current, size);
return resultBean; return resultBean;
} }

2
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@ -451,7 +451,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
.includeProcessVariables() .includeProcessVariables()
.includeTaskLocalVariables(); .includeTaskLocalVariables();
if(StringUtils.isNotBlank(orgPath)){ if(StringUtils.isNotBlank(orgPath)){
or.taskVariableValueEquals("orgPath", orgPath); // or.taskVariableValueEquals("orgPath", orgPath);
} }
//.taskCandidateGroupIn(roleSidList) //.taskCandidateGroupIn(roleSidList)
or.taskAssigneeLike("%" + userSid + "%") or.taskAssigneeLike("%" + userSid + "%")

Loading…
Cancel
Save