diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index 58364636..3cde6edc 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -334,9 +334,18 @@ public class FlowStartServiceImpl extends ServiceImpl 0){// + roles = flowChartRoles.stream().map(new Function() { + @Override + public String apply(FlowChartRole flowChartRole) { + return flowChartRole.getRoleId().toString(); + } + }).collect(Collectors.joining(",")); + + } String[] optIds = flowChartDetailRecord.getOptIds().split(","); @@ -352,24 +361,21 @@ public class FlowStartServiceImpl extends ServiceImpl 0){//设置必备权限 - String roles = flowChartRoles.stream().map(new Function() { - @Override - public String apply(FlowChartRole flowChartRole) { - return flowChartRole.getRoleId().toString(); - } - }).collect(Collectors.joining(",")); + if(roles != null){ if(flowApprovalRole.getRoleId() == null || flowApprovalRole.getRoleId().length() == 0){ flowApprovalRole.setRoleId(roles); }else{ flowApprovalRole.setRoleId(flowApprovalRole.getRoleId() + "," + roles); } } + + + if(flowChartDetailRecord.getStepType().intValue() == 0){ + //依次 + stepIndex++; + } + + } //stepIndex++; if(flowApprovalRole != null){ @@ -377,7 +383,7 @@ public class FlowStartServiceImpl extends ServiceImpl 0){//设置必备权限 + if(flowChartRoles != null && flowChartRoles.size() > 0){// String roles = flowChartRoles.stream().map(new Function() { @Override public String apply(FlowChartRole flowChartRole) {