fix:修改校验流程方法逻辑

ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/utils/VerifyExecutionProcess.java

@@ -123,8 +123,23 @@ public class VerifyExecutionProcess {
                 continue;
             }
 
+
             //判断节点前后是否执行自动脚本,并且脚本是否存在
             if (b.getNodeBefore().equals("true") || b.getNodeAfter().equals("true")) {
+
+                //判断当前节点名称是否存在&& '-' 前是否有内容
+                if (b.getNodeName().isEmpty()) {
+                    return false;
+                }
+                int separatorIndex = b.getNodeName().indexOf('-');
+                if (separatorIndex <= -1) {
+                    return false;
+                }
+                String nodeName = b.getNodeName().substring(0, b.getNodeName().indexOf('-'));
+                if (nodeName.isEmpty()) {
+                    return false;
+                }
+
                 // 查询自动执行脚本
                 BpmNodeScriptRelevance bpmNodeScriptRelevance = bpmNodeScriptRelevanceService.selectAutoScriptByNodeKey(b.getNodeKey());
                 if (bpmNodeScriptRelevance != null) {
@@ -186,45 +201,45 @@ public class VerifyExecutionProcess {
                 return false;
             }
             //判断当前节点是否是自定义表单类型，是判断该名称是否存在&& '-' 前是否有内容
-            if (b.getNodeFormType().equals("designForm")) {
-                BpmNodeScriptRelevance bpmNodeScriptRelevance = new BpmNodeScriptRelevance();
-                bpmNodeScriptRelevance.setScriptNodeFormType("designForm");
-                bpmNodeScriptRelevance.setNodeKey(b.getNodeKey());
-                List<BpmNodeScriptRelevance> bpmNodeScriptRelevanceList = bpmNodeScriptRelevanceService.selectBpmNodeScriptRelevanceList(bpmNodeScriptRelevance);
-                for (BpmNodeScriptRelevance bpmNodeScriptRelevance1 : bpmNodeScriptRelevanceList) {
-                    if (bpmNodeScriptRelevance1.getScriptNodeName().isEmpty()) {
-                        return false;
-                    }
-                    int separatorIndex = bpmNodeScriptRelevance1.getScriptNodeName().indexOf('-');
-                    if (separatorIndex <= -1) {
-                        return false;
-                    }
-                    String scriptNodeName = bpmNodeScriptRelevance1.getScriptNodeName().substring(0, bpmNodeScriptRelevance1.getScriptNodeName().indexOf('-'));
-                    if (scriptNodeName.isEmpty()) {
-                        return false;
-                    }
-                }
-            }
+//            if (b.getNodeFormType().equals("designForm")) {
+//                BpmNodeScriptRelevance bpmNodeScriptRelevance = new BpmNodeScriptRelevance();
+//                bpmNodeScriptRelevance.setScriptNodeFormType("designForm");
+//                bpmNodeScriptRelevance.setNodeKey(b.getNodeKey());
+//                List<BpmNodeScriptRelevance> bpmNodeScriptRelevanceList = bpmNodeScriptRelevanceService.selectBpmNodeScriptRelevanceList(bpmNodeScriptRelevance);
+//                for (BpmNodeScriptRelevance bpmNodeScriptRelevance1 : bpmNodeScriptRelevanceList) {
+//                    if (bpmNodeScriptRelevance1.getScriptNodeName().isEmpty()) {
+//                        return false;
+//                    }
+//                    int separatorIndex = bpmNodeScriptRelevance1.getScriptNodeName().indexOf('-');
+//                    if (separatorIndex <= -1) {
+//                        return false;
+//                    }
+//                    String scriptNodeName = bpmNodeScriptRelevance1.getScriptNodeName().substring(0, bpmNodeScriptRelevance1.getScriptNodeName().indexOf('-'));
+//                    if (scriptNodeName.isEmpty()) {
+//                        return false;
+//                    }
+//                }
+//            }
             //判断当前节点是否是拖拽表单类型，是查询drag_form表查看该表单是否存在
-            if (b.getNodeFormType().equals("dragForm")) {
-                ResponseEntity<AjaxResult> responseEntity = sending.sendGetFormInfo(Long.valueOf(b.getNodeFormKey()));
-                if (responseEntity.getStatusCodeValue() != 200) {
-                    return false;
-                }
-                if (!responseEntity.getBody().containsKey("data")) {
-                    return false;
-                }
-            }
+//            if (b.getNodeFormType().equals("dragForm")) {
+//                ResponseEntity<AjaxResult> responseEntity = sending.sendGetFormInfo(Long.valueOf(b.getNodeFormKey()));
+//                if (responseEntity.getStatusCodeValue() != 200) {
+//                    return false;
+//                }
+//                if (!responseEntity.getBody().containsKey("data")) {
+//                    return false;
+//                }
+//            }
             //判断当前节点是否是组合表单类型，是查询drag_table_group表查看该表单是否存在
-            if (b.getNodeFormType().equals("composeForm")) {
-                ResponseEntity<AjaxResult> responseEntity = sending.sendGetGroupInfo(b.getNodeFormKey());
-                if (responseEntity.getStatusCodeValue() != 200) {
-                    return false;
-                }
-                if (!responseEntity.getBody().containsKey("data")) {
-                    return false;
-                }
-            }
+//            if (b.getNodeFormType().equals("composeForm")) {
+//                ResponseEntity<AjaxResult> responseEntity = sending.sendGetGroupInfo(b.getNodeFormKey());
+//                if (responseEntity.getStatusCodeValue() != 200) {
+//                    return false;
+//                }
+//                if (!responseEntity.getBody().containsKey("data")) {
+//                    return false;
+//                }
+//            }
         }
         if (startNode <= 0 || endNode <= 0) {
             return false;