Jelajahi Sumber

fix:管道结束节点最后报错

lucky 2 bulan lalu
induk
melakukan
02d6267f05

+ 2 - 2
zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/runbpm/PreExecutionToolClass.java

@@ -444,8 +444,8 @@ public class PreExecutionToolClass<R> {
             iScriptEntity.setScriptNodeKey(taskNodeKey);
             iScriptEntity.setImplementationName("commonEndEvent");  // 直接调用结束节点执行逻辑
             // 调用执行结束节点
-            AjaxResult ajaxResult1 = iRunImplementationClass.RunScriptImplementationClassLogicCode(iScriptEntity, bpmRunNodeVo);
-            if ((Boolean) ajaxResult1.get("isFlag")) {
+            AjaxResult ajaxResult1 = iRunImplementationClass.RunScriptImplementationClassLogicCode(iScriptEntity, iScriptEntity);
+            if (!(Boolean) ajaxResult1.get("isFlag")) {
                 // 判断脚本执行状态
                 return AjaxResult.error(HttpStatus.SCRIPTEXCEPTION, "流程结束失败!");
             }

+ 3 - 3
zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/script/common/CommonNodeEndServiceImpl.java

@@ -31,9 +31,9 @@ public class CommonNodeEndServiceImpl implements IScriptService {
 
     @Override
     public Object preExecutionScript(Object parameter) {
-        IScriptEntity iScriptEntity = (IScriptEntity) parameter;
-        if (iScriptEntity.getScriptFlowKey() == null) return false;
-        if (iScriptEntity.getScriptNodeKey() == null) return false;
+//        IScriptEntity iScriptEntity = (IScriptEntity) parameter;
+//        if (iScriptEntity.getScriptFlowKey() == null) return false;
+//        if (iScriptEntity.getScriptNodeKey() == null) return false;
         return true;
     }