公式相关:动态范围查找元素

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

@@ -783,14 +783,18 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                             while (fm.find()){
                                FormData kf=  this.formDataMap.get(fm.group().replaceAll("'",""));
                                if(kf!=null&&!kf.empty()){
-                                 Object dd= kf.getValues().get(0).getValue();
-                                 rep= rep.replace("E["+fm.group()+"]",dd.toString());
-                                 rep="'"+rep+"'";
+                                ElementData ed= kf.getValues().get(0);
+                                 if(ed!=null&&Func.isNotEmpty(ed.getValue())){
+                                     rep= rep.replace("E["+fm.group()+"]",ed.getValue().toString());
+                                     rep="'"+rep+"'";
+                                     f=f.replace(im.group(),rep);
+                                 }else{
+                                    f="";
+                                 }
                                }else{
-                                   rep="'2>1'";
+                                    f="";
                                }
                             }
-                            f=f.replace(im.group(),rep);
                         }
                         formula.setFormula(f);
                     }