From fff7f72d8ef23056645eea7e7ac5bdfe01fe3b94 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Sat, 2 Apr 2022 19:52:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2--=E6=9F=A5=E8=AF=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE(=E4=B8=8B=E6=8B=89=E5=A4=9A=E9=80=89)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysDictItemController.java     |  4 ++-
 .../impl/DocumentSearchServiceImpl.java       | 28 ++++++++++++++-----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
index 483f821f2..bb733e519 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
@@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * <p>
@@ -77,7 +78,8 @@ public class SysDictItemController {
 		try {
 			sysDictItem.setCreateTime(new Date());
 			sysDictItem.setDelFlag(CommonConstant.DEL_FLAG_0);
-			sysDictItem.setItemValue(String.valueOf(RandomUtils.nextLong()));
+			sysDictItem.setItemValue(UUID.randomUUID().toString().replace("-", ""));
+//			sysDictItem.setItemValue(String.valueOf(RandomUtils.nextLong()));
 			sysDictItem.setStatus(1);
 			sysDictItemService.save(sysDictItem);
 			result.success("保存成功！");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
index d8a4a7f11..80ef1336b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
@@ -300,16 +300,30 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                 String key = entry.getKey();
                 String value = (String) entry.getValue();
                 if (ObjectUtils.isNotEmpty(value)) {
-                    for (String s : value.split(",")) {
-                        Map<String, Object> queryMap = new HashMap<>();
-                        Map<String, Object> queryMapTemp = new HashMap<>();
-                        queryMapTemp.put(key, s);
-                        queryMap.put("match_phrase", queryMapTemp);
-                        must.add(queryMap);
-                    }
+                    Map<String, Object> queryMap = new HashMap<>();
+                    Map<String, Object> queryMapTemp = new HashMap<>();
+                    queryMapTemp.put(key, "*"+value.replaceAll(",","*")+"*");
+//                    queryMapTemp.put(key, "*"+value+"*");
+                    queryMap.put("wildcard", queryMapTemp);
+                    must.add(queryMap);
                 }
             }
         }
+//        if (ObjectUtils.isNotEmpty(otherMap)) {
+//            for (Map.Entry<String, Object> entry : otherMap.entrySet()) {
+//                String key = entry.getKey();
+//                String value = (String) entry.getValue();
+//                if (ObjectUtils.isNotEmpty(value)) {
+//                    for (String s : value.split(",")) {
+//                        Map<String, Object> queryMap = new HashMap<>();
+//                        Map<String, Object> queryMapTemp = new HashMap<>();
+//                        queryMapTemp.put(key, s);
+//                        queryMap.put("match_phrase", queryMapTemp);
+//                        must.add(queryMap);
+//                    }
+//                }
+//            }
+//        }
         //封装时间类型字段查询(时间范围)
         if (ObjectUtils.isNotEmpty(dateMap)) {
             for (Map.Entry<String, Object> entry : dateMap.entrySet()) {