|
@@ -152,11 +152,11 @@ public class VisualController extends BaseESController {
|
|
queryBuilder.must(QueryBuilders.wildcardQuery("name.keyword", new StringBuilder().append("*").append(visualBO.getName()).append("*").toString()));
|
|
queryBuilder.must(QueryBuilders.wildcardQuery("name.keyword", new StringBuilder().append("*").append(visualBO.getName()).append("*").toString()));
|
|
}
|
|
}
|
|
if (StringUtils.isNotNull(visualBO.getDeptId())) {
|
|
if (StringUtils.isNotNull(visualBO.getDeptId())) {
|
|
- if ("view".equals(visualBO.getAssort())) {
|
|
|
|
|
|
+ dataPower(queryBuilder, DEPT_ID, visualBO.getDeptId());
|
|
|
|
+ /*if ("view".equals(visualBO.getAssort())) {
|
|
queryBuilder.must(QueryBuilders.termQuery(DEPT_ID, visualBO.getDeptId()));
|
|
queryBuilder.must(QueryBuilders.termQuery(DEPT_ID, visualBO.getDeptId()));
|
|
} else {
|
|
} else {
|
|
- dataPower(queryBuilder, DEPT_ID, visualBO.getDeptId());
|
|
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
}
|
|
}
|
|
// 筛选坐标指定范围内的数据
|
|
// 筛选坐标指定范围内的数据
|
|
if (StringUtils.isNotBlank(visualBO.getLatitude()) && StringUtils.isNotBlank(visualBO.getLongitude())
|
|
if (StringUtils.isNotBlank(visualBO.getLatitude()) && StringUtils.isNotBlank(visualBO.getLongitude())
|