Browse Source

优化

master
dimengzhe 2 years ago
parent
commit
bab5d4c772
  1. 4
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
  2. 7
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

4
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@ -489,7 +489,7 @@ public class FlowableRest implements FlowableFeign {
dto.setUserSid(nextUserSid); dto.setUserSid(nextUserSid);
dto.setTaskId(vo.getTaskId()); dto.setTaskId(vo.getTaskId());
dto.setTaskDefKey(taskDefKey); dto.setTaskDefKey(taskDefKey);
dto.setComment("系统管理员已自动审批"); dto.setComment("系统自动跳过");
return handleProsess(dto, false); return handleProsess(dto, false);
} }
List<FlowElement> flowElements = processService.calApprovePath(dto.getModelId(), dto.getModelId(), List<FlowElement> flowElements = processService.calApprovePath(dto.getModelId(), dto.getModelId(),
@ -570,7 +570,7 @@ public class FlowableRest implements FlowableFeign {
dto.setUserSid(nextUserSid); dto.setUserSid(nextUserSid);
dto.setTaskId(vo.getTaskId()); dto.setTaskId(vo.getTaskId());
dto.setTaskDefKey(taskDefKey); dto.setTaskDefKey(taskDefKey);
dto.setComment("系统管理员已自动审批"); dto.setComment("系统自动跳过");
return handleProsess(dto, false); return handleProsess(dto, false);
} }

7
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

@ -177,6 +177,13 @@ public class FlowableRest implements FlowableFeign {
stringObjectMap.put("createTime",DateUtil.format(f.getCreateTime(),"yyyy-MM-dd HH:mm:ss")); stringObjectMap.put("createTime",DateUtil.format(f.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
a.setFlowableRecordVo(stringObjectMap); a.setFlowableRecordVo(stringObjectMap);
a.setState(0+""); a.setState(0+"");
List<com.yxt.anrui.flowable.api.flowtask.TaskUserInfo> taskUserInfos = f.getTaskUserInfos();
if(taskUserInfos.size() == 1){
com.yxt.anrui.flowable.api.flowtask.TaskUserInfo appUserVo = taskUserInfos.get(0);
if("admin".equals(appUserVo.getAssigneeName())){
return;
}
}
flowList.add(a); flowList.add(a);
}); });
//评论记录 //评论记录

Loading…
Cancel
Save