From 109c2db9a2c12aaf4bdae4036d1a8469e801fe66 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Fri, 18 Mar 2022 13:46:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F+=E8=AE=A2=E9=98=85-=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2%=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/OnlCgformCollectionMapper.xml  | 26 ++++++++++++++++---
 .../mapper/xml/OnlCgformSubscribeMapper.xml   | 26 ++++++++++++++++---
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml
index afb2314fd..009e21d33 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml
@@ -24,12 +24,30 @@
              onl_cgform_collection occ
         left join buss_document_library bdl on occ.document_id = bdl.id
         where occ.create_by = #{params.createBy}
-        <if test="params.serialNumber != null and params.serialNumber != '' ">
-            and bdl.serial_number like concat(concat('%',#{params.serialNumber}),'%')
+        <if test="params.serialNumber != null and params.serialNumber != ''">
+            <!--搜索条件:编号;包含%,单独搜索-->
+            <choose>
+                <when test='params.serialNumber != null and params.serialNumber != "" and params.serialNumber.contains("%")'>
+                    and bdl.serial_number like '%1%%' escape '1'
+                </when>
+                <otherwise>
+                    and bdl.serial_number like concat(concat('%',#{params.serialNumber}),'%')
+                </otherwise>
+            </choose>
         </if>
-        <if test="params.title != null and params.title != '' ">
-            and bdl.title like concat(concat('%',#{params.title}),'%')
+
+        <if test="params.title != null and params.title != ''">
+            <!--搜索条件:标题;包含%,单独搜索-->
+            <choose>
+                <when test='params.title != null and params.title != "" and params.title.contains("%")'>
+                    and bdl.title like '%1%%' escape '1'
+                </when>
+                <otherwise>
+                    and bdl.title like concat(concat('%',#{params.title}),'%')
+                </otherwise>
+            </choose>
         </if>
+
         <if test="params.state != null and params.state != '' ">
             and bdl.state in
             <foreach collection="params.state.split(',')" index="index" item="item" open="(" separator="," close=")">
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml
index 8ccb46765..b1ba5a3d5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml
@@ -25,12 +25,30 @@
         left join
              buss_document_library bdl on ocs.document_id = bdl.id
         where ocs.create_by = #{params.createBy}
-        <if test="params.serialNumber != null and params.serialNumber != '' ">
-            and bdl.serial_number like concat(concat('%',#{params.serialNumber}),'%')
+        <if test="params.serialNumber != null and params.serialNumber != ''">
+            <!--搜索条件:编号;包含%,单独搜索-->
+            <choose>
+                <when test='params.serialNumber != null and params.serialNumber != "" and params.serialNumber.contains("%")'>
+                    and bdl.serial_number like '%1%%' escape '1'
+                </when>
+                <otherwise>
+                    and bdl.serial_number like concat(concat('%',#{params.serialNumber}),'%')
+                </otherwise>
+            </choose>
         </if>
-        <if test="params.title != null and params.title != '' ">
-            and bdl.title like concat(concat('%',#{params.title}),'%')
+
+        <if test="params.title != null and params.title != ''">
+            <!--搜索条件:标题;包含%,单独搜索-->
+            <choose>
+                <when test='params.title != null and params.title != "" and params.title.contains("%")'>
+                    and bdl.title like '%1%%' escape '1'
+                </when>
+                <otherwise>
+                    and bdl.title like concat(concat('%',#{params.title}),'%')
+                </otherwise>
+            </choose>
         </if>
+          
         <if test="params.state != null and params.state != '' ">
             and bdl.state in
             <foreach collection="params.state.split(',')" index="index" item="item" open="(" separator="," close=")">