|
@@ -109,7 +109,9 @@ public class PreExecutionToolClass<R> {
|
|
bpmProcessConfigurationList.forEach(item -> {
|
|
bpmProcessConfigurationList.forEach(item -> {
|
|
BpmUserScriptVo bpmUserScriptVo = new BpmUserScriptVo();
|
|
BpmUserScriptVo bpmUserScriptVo = new BpmUserScriptVo();
|
|
bpmUserScriptVo.setNodeKey(item.getNodeKey());
|
|
bpmUserScriptVo.setNodeKey(item.getNodeKey());
|
|
- bpmUserScriptVo.setBpmNodeHandleUserList(bpmNodeHandleUserMapper.selectBpmNodeHandleUserList(new BpmNodeHandleUser(item.getNodeRolePermission())));
|
|
|
|
|
|
+ if (item.getNodeRolePermission() != null) {
|
|
|
|
+ bpmUserScriptVo.setBpmNodeHandleUserList(bpmNodeHandleUserMapper.selectBpmNodeHandleUserList(new BpmNodeHandleUser(item.getNodeRolePermission())));
|
|
|
|
+ }
|
|
bpmUserScriptVo.setBpmNodeScriptRelevanceList(bpmNodeScriptRelevanceMapper.selectBpmNodeScriptRelevanceList(new BpmNodeScriptRelevance(item.getNodeKey())));
|
|
bpmUserScriptVo.setBpmNodeScriptRelevanceList(bpmNodeScriptRelevanceMapper.selectBpmNodeScriptRelevanceList(new BpmNodeScriptRelevance(item.getNodeKey())));
|
|
bpmNodeScriptRelevanceList.addAll(bpmUserScriptVo.getBpmNodeScriptRelevanceList());
|
|
bpmNodeScriptRelevanceList.addAll(bpmUserScriptVo.getBpmNodeScriptRelevanceList());
|
|
bpmUserScriptVoList.add(bpmUserScriptVo);
|
|
bpmUserScriptVoList.add(bpmUserScriptVo);
|
|
@@ -175,9 +177,13 @@ public class PreExecutionToolClass<R> {
|
|
// 节点标识
|
|
// 节点标识
|
|
bpmExecuteNodeMiddle.setTaskNodeKey(item.getNodeKey());
|
|
bpmExecuteNodeMiddle.setTaskNodeKey(item.getNodeKey());
|
|
// 节点执行角色编码
|
|
// 节点执行角色编码
|
|
- bpmExecuteNodeMiddle.setTaskRealRole(item.getBpmNodeHandleUserList().get(index).getRealRole());
|
|
|
|
|
|
+ if (item.getBpmNodeHandleUserList() != null) {
|
|
|
|
+ bpmExecuteNodeMiddle.setTaskRealRole(item.getBpmNodeHandleUserList().get(index).getRealRole());
|
|
|
|
+ }
|
|
// 节点执行用户id
|
|
// 节点执行用户id
|
|
- bpmExecuteNodeMiddle.setTaskExecuteUserNo(item.getBpmNodeHandleUserList().get(index).getExecuteUserNo());
|
|
|
|
|
|
+ if (item.getBpmNodeHandleUserList() != null) {
|
|
|
|
+ bpmExecuteNodeMiddle.setTaskExecuteUserNo(item.getBpmNodeHandleUserList().get(index).getExecuteUserNo());
|
|
|
|
+ }
|
|
// 节点手动触发脚本
|
|
// 节点手动触发脚本
|
|
List<String> script0 = new ArrayList<>(), script1 = new ArrayList<>(), script2 = new ArrayList<>();// 异常手动触发 // 正常自动触发 // 节点前后自动触发
|
|
List<String> script0 = new ArrayList<>(), script1 = new ArrayList<>(), script2 = new ArrayList<>();// 异常手动触发 // 正常自动触发 // 节点前后自动触发
|
|
item.getBpmNodeScriptRelevanceList().forEach(stem -> {
|
|
item.getBpmNodeScriptRelevanceList().forEach(stem -> {
|