From 0382f40fe8922fac117da1f28a78085000790526 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 9 Mar 2022 14:02:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../document/controller/BussDocumentLibraryEOController.java | 5 -----
 .../service/impl/BussDocumentLibraryEOServiceImpl.java       | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
index 84237fe61..0cf6b1327 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
@@ -1,12 +1,9 @@
 package com.jero.modules.document.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
-import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.document.entity.BussDocumentLibraryEO;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import io.swagger.annotations.Api;
@@ -20,12 +17,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
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 1559b4c6a..17646af16 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
@@ -1390,12 +1390,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType)
                                     || FieldTypeEnum.PULL_MORE.getValue().equals(fieldType)) {
                                 StringBuilder valueSb = new StringBuilder();
+                                StringBuilder condition = new StringBuilder();
                                 for (String valueTemp : value.split(",")) {
                                     valueSb.append("'" + valueTemp + "',");
+                                    condition.append(" or " + key + " like concat(concat('%','" + valueTemp + "'),'%')");
                                 }
                                 String substring = valueSb.substring(0, valueSb.length() - 1);
                                 //下拉单选或下拉多选
-                                conditionSb.append(" and " + key + " in(" + substring + ")");
+                                conditionSb.append(" and " + key + " in(" + substring + ")" + condition.toString());
 
                             } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldType)) {
                                 //日期(区分单日期还时间范围)