From d5ce89b410919bfe601514c2cd8205c575b567fa Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 21 Oct 2022 16:08:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93--=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/mapper/xml/ProjectLibraryBaseMapper.xml       | 8 ++++----
 .../service/impl/ProjectLibraryBaseServiceImpl.java       | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index 3fa838a91..954daa5bf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -68,10 +68,10 @@
                         ( pni.project_name like '%1%%' escape '1' or pni.project_name like '%1%%' escape '1')
                     </when>
                     <otherwise>
-                        (pni.project_name like concat('%',#{params.projectName},'%') or pyni.year_name like concat('%',#{params.projectName},'%'))
-                    </otherwise>
-                </choose>
-            </if>
+            <!--(pni.project_name like concat('%',#{params.projectName},'%') or pyni.year_name like concat('%',#{params.projectName},'%'))-->
+        </otherwise>
+    </choose>
+</if>
 
             <!--搜索条件:目标市场-->
             <if test="params.targetMarket != null and params.targetMarket != '' ">
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 39ecfdd40..32943004c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -491,6 +491,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 						+ "-" + projectVersion);
 			}
 		}
+		//项目名称模糊查询特殊处理(因为项目名称是多字段拼接的)
+		if(ObjectUtils.isNotEmpty(params.get("projectName"))){
+			result = result.stream().filter(e->e.getProjectName().toLowerCase().contains(String.valueOf(params.get("projectName")).toLowerCase())).collect(Collectors.toList());
+		}
 		//数据组装
 		List<ProjectLibraryBase> resultTemp = new LinkedList<>();
 		for (ProjectLibraryBase projectLibraryBase : result) {