Merge branch 'dev' of https://git.yingcaibx.com/tl/api into dev

src/main/java/com/xjrsoft/module/liteflow/node/util.java

@@ -11,8 +11,9 @@ public class util {
      * @return
      */
     public static Long getFormDataId(Map<String, Object> params) {
-        if (params != null) {
-            Long id = (Long) params.get("id");
+        Map<String, Object> formData = getFormData(params);
+        if (formData != null) {
+            Long id = (Long) formData.get("id");
             return id;
         }
         return null;

src/main/java/com/xjrsoft/module/workflow/listener/ExecutionDelegate.java

@@ -803,15 +803,12 @@ public class ExecutionDelegate implements ExecutionListener {
             }
             //如果是规则引擎
             else {
-                nodeEventConfig.setLiteflowId("1719906259126775809");
                 String liteflowId = nodeEventConfig.getLiteflowId();
                 XjrLiteflowChain chain = liteflowChainService.getById(liteflowId);
                 // 更新规则
                 LiteFlowChainELBuilder.createChain().setChainName(chain.getChainName()).setEL(chain.getElData()).build();
                 // 执行规则
                 flowExecutor.execute2Resp(chain.getChainName(), null,varMap);
-
-                System.out.println("规则引擎");
             }
 
         }