Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/elk/ElkController.java

@@ -74,7 +74,7 @@ public class ElkController {
      * 部门字段
      */
     private String deptName = "departmentname.keyword";
-    private String domainType = "domain_type";
+    private String domainType = "domain_type.keyword";
     /**
      * 发布时间
      */

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/ElkServiceImpl.java

@@ -78,6 +78,19 @@ public class ElkServiceImpl implements ElkService {
 
     @Override
     public List<String> domainAll() {
+        List<String> stringList = elkDao.domainAll();
+        List<String> newStringList = new ArrayList<>();
+        Boolean flag = false;
+        for (int i = 0; i < stringList.size(); i++) {
+            if (!stringList.equals("其它")) {
+                newStringList.add(stringList.get(i));
+            } else {
+                flag = true;
+            }
+        }
+        if (flag) {
+            newStringList.add("其它");
+        }
         return elkDao.domainAll();
     }