diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index a1ef482d2b..f91585c2d5 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/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.setTaskId(vo.getTaskId()); dto.setTaskDefKey(taskDefKey); - dto.setComment("系统管理员已自动审批"); + dto.setComment("系统自动跳过"); return handleProsess(dto, false); } List flowElements = processService.calApprovePath(dto.getModelId(), dto.getModelId(), @@ -570,7 +570,7 @@ public class FlowableRest implements FlowableFeign { dto.setUserSid(nextUserSid); dto.setTaskId(vo.getTaskId()); dto.setTaskDefKey(taskDefKey); - dto.setComment("系统管理员已自动审批"); + dto.setComment("系统自动跳过"); return handleProsess(dto, false); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index 92bd44b4cc..1d077dd0dd 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/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")); a.setFlowableRecordVo(stringObjectMap); a.setState(0+""); + List 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); }); //评论记录