公式相关

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

@@ -300,9 +300,9 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     Map<String, Object> currentMap = new HashMap<>(this.constantMap);
                     List<String>  relyList = fd.getFormula().getRelyList();
                     if(CollectionUtil.isNotEmpty(relyList)){
-                        List<FormData>  ele = this.formDataList.stream().filter(e->relyList.contains(e.getCode())).collect(Collectors.toList());
+                        List<FormData>  ele = this.formDataList.stream().filter(e->relyList.contains(e.getCode())&&e.getValues().stream().anyMatch(Func::isNotEmpty)).collect(Collectors.toList());
                         if(ele.size()<relyList.size()){
-                            System.out.println("不满足依赖要求");
+                            System.out.println(formula.getFormula()+"不满足依赖要求");
                         }
                         LinkedHashMap<String,FormData> fdMap =new LinkedHashMap<>();
                         ele.forEach(e->{