From b41ec525a2eeca2275add1f75039e76c3c84b48e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 23 May 2022 11:55:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 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 ca4c31514..7e17e6c0f 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
@@ -2931,12 +2931,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 fieldListNew.add(fieldTemp);
             }
         }
-        //封装查询条件
+        //封装查询条件(包含高级搜索)
         String condition = getConditionStr(parameter);
         int pageNo = Integer.parseInt(parameter.get("pageNo").toString());
         int pageSize = Integer.parseInt(parameter.get("pageSize").toString());
-        IPage page = new Page(pageNo, pageSize);
 
+
+        IPage page = new Page(pageNo, pageSize);
         IPage infoPage = bussDocumentLibraryEOMapper.getInfoPage(page, " " + StringUtils.join(fieldListNew, ","), condition);
 
         //树形数据字典
@@ -3060,6 +3061,17 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             }
 
         }
+
+        //高级搜索  queryConditionVOList  List<QueryConditionVO>
+        List<QueryConditionVO> queryConditionVOList = (List<QueryConditionVO>) parameter.get("queryConditionVOList");
+        if(ObjectUtils.isNotEmpty(queryConditionVOList)){
+            String queryCondition = sqlJoint(queryConditionVOList);
+            if(StringUtils.isNotBlank(queryCondition)){
+                conditionSb.append(queryCondition);
+            }
+        }
+
+
         //处理列表表头排序
         if (StringUtils.isNotBlank((String) parameter.get("orderByField"))) {
             conditionSb.append(" order by " + (String) parameter.get("orderByField"));
@@ -5048,10 +5060,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
     //高级搜索条件拼接
 
-    private void sqlJoint(List<QueryConditionVO> queryConditionVOList){
+    private String sqlJoint(List<QueryConditionVO> queryConditionVOList){
+        StringBuilder sb = new StringBuilder();
         if(queryConditionVOList.size() != 0){
             int count =0;
-            StringBuilder sb = new StringBuilder();
             for (QueryConditionVO queryConditionVO : queryConditionVOList) {
                 String type = queryConditionVO.getType();//and或or
                 String rule = queryConditionVO.getRule();
@@ -5083,6 +5095,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 }
             }
         }
+        return sb.toString();
     }