Merge branch 'develop_migration' into 'develop_master'

Develop migration See merge request !132
2021-08-25 02:59:36 +00:00
parent 81799abfb1 2d3762e6ef
commit 67dab85275
1 changed files with 9 additions and 2 deletions
@@ -259,10 +259,17 @@ public class SearchCenterServiceImpl implements SearchCenterService {
        }

        String fieldInfo = InitStandAttrSearchUtil.queryField;
+        String fieldLawsInfo = InitStandAttrSearchUtil.queryFieldLaws;
+        String fieldBussInfo = InitStandAttrSearchUtil.queryFieldBuss;
        List<String> fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
-
+        List<String> fieldLawsInfoList = Arrays.asList(fieldLawsInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
+        List<String> fieldBussInfoList = Arrays.asList(fieldBussInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
+        List<String> fieldList = new ArrayList<>();
+        fieldList.addAll(fieldInfoList);
+        fieldList.addAll(fieldLawsInfoList);
+        fieldList.addAll(fieldBussInfoList);
        // 自动匹配动态属性字段 es 查询
-        for (String field : fieldInfoList) {
+        for (String field : fieldList) {
            // 关键字查询属性字段
            String keyWordField = field + ".keyword";
            String keyWordField2 = field + "Name.keyword";