Commit 920ee549 authored by 梁光意's avatar 梁光意

修改提示语

parent e67dec12
...@@ -106,17 +106,17 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper, ...@@ -106,17 +106,17 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
} }
if(CollectionUtils.isEmpty(dto.getWhere())){ if(CollectionUtils.isEmpty(dto.getWhere())){
throw new SysException("where 条件不能为空"); throw new SysException("暂无数据,请检查图表数据或关联查询组件是否已配置");
} }
dto.getWhere().forEach(x->{ dto.getWhere().forEach(x->{
if(CollectionUtils.isEmpty(x.keySet())){ if(CollectionUtils.isEmpty(x.keySet())){
throw new SysException("条件 and 或者or 都必须说明"); throw new SysException("暂无数据,请检查图表数据或关联查询组件是否已配置");
} }
x.forEach((k,v)->{ x.forEach((k,v)->{
if(v.stream().anyMatch(y -> StringUtils.isBlank(y.getKey())) 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())).anyMatch(y -> ObjectUtils.isEmpty(y.getValue()))
|| v.stream().anyMatch(y -> StringUtils.isBlank(y.getQueryType()))) { || v.stream().anyMatch(y -> StringUtils.isBlank(y.getQueryType()))) {
throw new SysException("where 条件不能key value queryType 都不能为空"); throw new SysException("暂无数据,请检查图表数据或关联查询组件是否已配置");
} }
}); });
}); });
...@@ -144,17 +144,17 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper, ...@@ -144,17 +144,17 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
} }
} }
if(CollectionUtils.isEmpty(dto.getWhere())){ if(CollectionUtils.isEmpty(dto.getWhere())){
throw new SysException("where 条件不能为空"); throw new SysException("暂无数据,请检查图表数据或关联查询组件是否已配置");
} }
dto.getWhere().forEach(x->{ dto.getWhere().forEach(x->{
if(CollectionUtils.isEmpty(x.keySet())){ if(CollectionUtils.isEmpty(x.keySet())){
throw new SysException("条件 and 或者or 都必须说明"); throw new SysException("暂无数据,请检查图表数据或关联查询组件是否已配置");
} }
x.forEach((k,v)->{ x.forEach((k,v)->{
if(v.stream().anyMatch(y -> StringUtils.isBlank(y.getKey())) 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())).anyMatch(y -> ObjectUtils.isEmpty(y.getValue()))
|| v.stream().anyMatch(y -> StringUtils.isBlank(y.getQueryType()))) { || v.stream().anyMatch(y -> StringUtils.isBlank(y.getQueryType()))) {
throw new SysException("where 条件不能key value queryType 都不能为空"); throw new SysException("暂无数据,请检查图表数据或关联查询组件是否已配置");
} }
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment