Explorar el Código

测站点相关

yangyj hace 2 años
padre
commit
ab32806d4f

+ 5 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -129,11 +129,15 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         if(CollectionUtil.isNotEmpty(this.env.formDataList)){
             for(FormData fd:this.env.formDataList){
                 /*预处理公式脚本*/
-                if(Func.isEmpty(fd.getFormula())){
+                if(!fd.verify()){
                     /*不存公式,则认为执行完成,不会再主动执行*/
                     fd.setFinished(Boolean.TRUE);
                     continue;
                 }
+                if("FORM_SITE".equals(fd.getFormula().getNumber())){
+                    fd.setFinished(Boolean.TRUE);
+                    continue;
+                }
                 String tmp =fd.getFormula().getFormula();
                 tmp = tmp.replace(FC, CustomFunction.CLASS_CALL);
                 if(tmp.contains(CustomFunction.CLASS_CALL+"ifelse")){