From d0542a79b1a4a0a1637cbd75ad346205d06525a0 Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Mon, 7 Nov 2022 15:16:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E8=B5=B7=E8=8D=89=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E3=80=81=E9=A1=B9=E7=9B=AE=E5=88=86=E5=8F=91=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=88=86=E5=88=AB=E5=AF=B9=E9=A1=B9=E7=9B=AE=E7=BE=A4?=
 =?UTF-8?q?=E8=B7=9F=E9=A1=B9=E7=9B=AE=E5=A2=9E=E5=8A=A0=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E7=9A=84=E6=A8=A1=E7=B3=8A=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandProjectLibraryMapper.xml           | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
index f1b4bd5b..90d86638 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
@@ -418,7 +418,7 @@
     </select>
     <select id="selectListByids" resultType="java.lang.String">
         select distinct sar_stand_project_relation.project_id as projectId
-        from sar_stand_project_relation 
+        from sar_stand_project_relation
         where sar_stand_project_relation.stand_id in
         <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
             #{item}
@@ -439,6 +439,9 @@
         <if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
           and  sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
         </if>
+        <if test="sarStandProjectLibrary.projectGroup != null and sarStandProjectLibrary.projectGroup != ''">
+            and sar_stand_project_library.project_group like concat(concat('%',#{sarStandProjectLibrary.projectGroup}),'%')
+        </if>
         GROUP BY sar_stand_project_library.project_group
         limit  ${(current-1) * size},${size}
     </select>
@@ -457,7 +460,12 @@
         </if>
         <if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
             and sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
-        </if> )a
+        </if>
+        <if test="sarStandProjectLibrary.projectGroup != null and sarStandProjectLibrary.projectGroup != ''">
+            and sar_stand_project_library.project_group like concat(concat('%',#{sarStandProjectLibrary.projectGroup}),'%')
+        </if>
+        GROUP BY sar_stand_project_library.project_group
+         )a
     </select>
     <select id="queryProjects"
             resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
@@ -480,6 +488,9 @@
         <if test="sarStandProjectLibrary.projectStatus != null and sarStandProjectLibrary.projectStatus != ''">
             and  sar_stand_project_library.project_status=#{sarStandProjectLibrary.projectStatus}
         </if>
+        <if test="sarStandProjectLibrary.projectName != null and sarStandProjectLibrary.projectName != ''">
+            and  sar_stand_project_library.project_name like concat(concat('%',#{sarStandProjectLibrary.projectName}),'%')
+        </if>
         <if test="null != groups and groups.size()>0">
         and sar_stand_project_library.project_group in
         <foreach collection="groups" index="index" item="item" open="(" separator="," close=")">
@@ -509,6 +520,9 @@
         <if test="sarStandProjectLibrary.projectStatus != null and sarStandProjectLibrary.projectStatus != ''">
             and sar_stand_project_library.project_status=#{sarStandProjectLibrary.projectStatus}
         </if>
+        <if test="sarStandProjectLibrary.projectName != null and sarStandProjectLibrary.projectName != ''">
+            and  sar_stand_project_library.project_name like concat(concat('%',#{sarStandProjectLibrary.projectName}),'%')
+        </if>
         <if test="null != groups and groups.size()>0">
         and sar_stand_project_library.project_group in
         <foreach collection="groups" index="index" item="item" open="(" separator="," close=")">