From 761ad0a0a23581c1ae30d0d1f116dfcea69ced55 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 31 May 2022 11:11:45 +0800
Subject: [PATCH] =?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

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 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 eed24dafb..99a004b3d 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
@@ -5467,6 +5467,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 //如果查询字段对应的搜索条件值为空,则不作处理
                 if(StringUtils.isNotBlank(val)){
                     count ++;//从第二个查询条件开始拼接type(and或or)
+                    if(count > 1){
+                        sb.append(" "+type + " ");
+                    }
                     sb.append(" " + field + " ");
                     //查询类型
                     String ruleTemp = queryType(rule);
@@ -5499,9 +5502,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             sb.append("'" + val + "'");
                         }
                     }
-                    if(count > 1){
-                        sb.append(type + " ");
-                    }
                 }
             }
         }