From bb3f346fddab4ddccdd89996c7a6dbae79f490e9 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 24 Mar 2022 16:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java    | 4 ++--
 .../service/impl/DocumentSearchServiceImpl.java           | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index b2e26f3cb..36177fbe9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -2159,11 +2159,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 StringBuilder condition = new StringBuilder();
                                 for (String valueTemp : value.split(",")) {
                                     valueSb.append("'" + valueTemp + "',");
-                                    condition.append(" or " + key + " like concat(concat('%','" + valueTemp + "'),'%')");
+                                    condition.append(" or " + key + " like concat(concat('%','" + valueTemp + "'),'%'))");
                                 }
                                 String substring = valueSb.substring(0, valueSb.length() - 1);
                                 //下拉单选或下拉多选
-                                conditionSb.append(" and " + key + " in(" + substring + ")" + condition.toString());
+                                conditionSb.append(" and (" + key + " in(" + substring + ")" + condition.toString());
 
                             } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldType)) {
                                 //日期(区分单日期还时间范围)
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 d049c197b..9e723c769 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
@@ -88,7 +88,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                 .filter(e -> FieldTypeEnum.TEXT_STRING.getValue().equals(e.getFieldShowType())
                         || FieldTypeEnum.TEXT_NUMBER.getValue().equals(e.getFieldShowType()))
                 .collect(Collectors.toList());
-        List<String> inputFieldList = inputOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldEnName).collect(Collectors.toList());
+        List<String> inputFieldList = inputOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
         //下拉,树形,日期等字段
         List<OnlCgformField> otherOnlCgformFieldList = fieldList.stream()
                 .filter(e -> FieldTypeEnum.PULL_SINGLE.getValue().equals(e.getFieldShowType())//下拉单选
@@ -97,7 +97,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                         || FieldTypeEnum.DATE_MORE.getValue().equals(e.getFieldShowType())//日期多选
                         || FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))//树形
                 .collect(Collectors.toList());
-        List<String> otherFieldList = otherOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldEnName).collect(Collectors.toList());
+        List<String> otherFieldList = otherOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
 
         //过滤出下拉选
         List<OnlCgformField> onlCgformFieldList = fieldList.stream()
@@ -136,6 +136,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
             }
         }
         JSONArray should = new JSONArray();
+        JSONArray must = new JSONArray();
         //封装输入框查询条件
         if (ObjectUtils.isNotEmpty(inputMap)) {
             Map<String, Object> queryMap = new HashMap<>();
@@ -145,10 +146,11 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                 Map<String, Object> queryMapTemp = new HashMap<>();
                 queryMapTemp.put(key, value);
                 queryMap.put("match", queryMapTemp);
+                must.add(queryMap);
             }
+            int a=0;
         }
         //封装下拉,树形,日期查询条件
-        JSONArray must = new JSONArray();
         if (ObjectUtils.isNotEmpty(otherMap)) {
             for (Map.Entry<String, Object> entry : otherMap.entrySet()) {
                 String key = entry.getKey();