From 8096d5b86d1e661ef9d99c9f0bce33bcbcd8f74e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 25 Mar 2022 18:19:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--ocr=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E8=B0=83=E5=8F=96=E5=B7=B2=E5=85=A5=E5=BA=93=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=88=86=E9=A1=B5=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DocumentSearchServiceImpl.java       | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

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 2bd31a70d..37853567f 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
@@ -59,6 +59,14 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
     @Override
     public List<Map<String, Object>> queryCondition(String flag, String cut, String searchFlag) {
         List<Map<String, Object>> mapList = iBussDocumentLibraryEOService.queryCondition(flag, cut, searchFlag);
+        //搜索条件手动添加正文
+        if("1".equals(searchFlag)){
+            Map<String,Object> map = new HashMap<>();
+            map.put("db_field_txt","正文");
+            map.put("field_show_type","1");
+            map.put("db_field_name","file_text");
+            mapList.add(map);
+        }
         //type = 0时,查询下拉,树形,日期等字段   type = 1时,查询输入框字段
         return mapList;
     }
@@ -693,8 +701,26 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
         }
         int pageNo = Integer.parseInt(map.get("pageNo").toString());
         int pageSize = Integer.parseInt(map.get("pageSize").toString());
+        //判断第一次传参和第二次传参  inputFieldList
+        String selectValue = "";
+        String selectValueTwo = "";
+        for (Map.Entry<String, Object> entry : mapOne.entrySet()) {
+            String key = entry.getKey();
+            String value = (String)entry.getValue();
+            if(inputFieldList.contains(key) && StringUtils.isNotBlank(value)){
+                selectValue = value;
+            }
+        }
+        for (Map.Entry<String, Object> entry : mapTwo.entrySet()) {
+            String key = entry.getKey();
+            String value = (String)entry.getValue();
+            if(inputFieldList.contains(key) && StringUtils.isNotBlank(value)){
+                selectValueTwo = value;
+            }
+        }
 
-        IPage iPage = getiPage(null, null, must, pageNo, pageSize);
+
+        IPage iPage = getiPage(selectValue, selectValueTwo, must, pageNo, pageSize);
         return iPage;
     }