Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/syc/slm/slmbi/service/impl/BusinessConfigServiceImpl.java

@@ -114,7 +114,9 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
             }
             x.forEach((k,v)->{
                 if(v.stream().anyMatch(y -> StringUtils.isBlank(y.getKey()))
-                           || v.stream().filter(y -> !Condition.NO_LIMIT.getValue().equals(y.getQueryType())).anyMatch(y -> ObjectUtils.isEmpty(y.getValue()))
+                           || v.stream().filter(y -> !(Condition.NO_LIMIT.getValue().equals(y.getQueryType())
+                                                       ||Condition.NO_NULL.getValue().equals(y.getQueryType())
+                                                       ||Condition.IS_NULL.getValue().equals(y.getQueryType()))).anyMatch(y -> ObjectUtils.isEmpty(y.getValue()))
                 || v.stream().anyMatch(y -> StringUtils.isBlank(y.getQueryType()))) {
                     throw new SysException("暂无数据，请检查图表数据或关联查询组件是否已配置");
                 }
@@ -152,7 +154,9 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
             }
             x.forEach((k,v)->{
                 if(v.stream().anyMatch(y -> StringUtils.isBlank(y.getKey()))
-                   || v.stream().filter(y -> !Condition.NO_LIMIT.getValue().equals(y.getQueryType())).anyMatch(y -> ObjectUtils.isEmpty(y.getValue()))
+                   || v.stream().filter(y -> !(Condition.NO_LIMIT.getValue().equals(y.getQueryType())
+                                             ||Condition.NO_NULL.getValue().equals(y.getQueryType())
+                                             ||Condition.IS_NULL.getValue().equals(y.getQueryType()))).anyMatch(y -> ObjectUtils.isEmpty(y.getValue()))
                    || v.stream().anyMatch(y -> StringUtils.isBlank(y.getQueryType()))) {
                     throw new SysException("暂无数据，请检查图表数据或关联查询组件是否已配置");
                 }