Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/resources/mapper/system/ProposalInfoMapper.xml

@@ -115,7 +115,8 @@
         <where>
             <if test="proposalUserId != null ">and proposal_user_id = #{proposalUserId}</if>
             <if test="proposalNumber != null  and proposalNumber != ''">and proposal_number = #{proposalNumber}</if>
-            <if test="title != null  and title != ''">and title = #{title}</if>
+            <if test="title != null  and title != ''">and title like concat('%', #{title},
+                '%')</if>
             <if test="proposalName != null  and proposalName != ''">and proposal_name like concat('%', #{proposalName},
                 '%')
             </if>
@@ -200,7 +201,8 @@
             <if test="type != null  and type != ''">and u.type = #{type}</if>
             <if test="proposalUserId != null  ">and u.user_id = #{proposalUserId}</if>
             <if test="proposalNumber != null  and proposalNumber != ''">and p.proposal_number = #{proposalNumber}</if>
-            <if test="title != null  and title != ''">and p.title = #{title}</if>
+            <if test="title != null  and title != ''">and p.title like concat('%', #{title},
+                '%')</if>
             <if test="proposalName != null  and proposalName != ''">and p.proposal_name like concat('%',
                 #{proposalName}, '%')
             </if>
@@ -274,7 +276,8 @@
             <if test="deptId != null  and deptId != ''">and u.dept_id = #{deptId}</if>
             <if test="dwType != null  and dwType != ''">and u.type = #{dwType}</if>
             <if test="proposalNumber != null  and proposalNumber != ''">and p.proposal_number = #{proposalNumber}</if>
-            <if test="title != null  and title != ''">and p.title = #{title}</if>
+            <if test="title != null  and title != ''">and p.title like concat('%', #{title},
+                '%')</if>
             <if test="proposalName != null  and proposalName != ''">and p.proposal_name like concat('%',
                 #{proposalName}, '%')
             </if>
@@ -337,7 +340,8 @@
             proposal_progress > 3
             <if test="proposalUserId != null ">and proposal_user_id = #{proposalUserId}</if>
             <if test="proposalNumber != null  and proposalNumber != ''">and proposal_number = #{proposalNumber}</if>
-            <if test="title != null  and title != ''">and title = #{title}</if>
+            <if test="title != null  and title != ''">and title like concat('%', #{title},
+                '%')</if>
             <if test="proposalName != null  and proposalName != ''">and proposal_name like concat('%', #{proposalName},
                 '%')
             </if>

ruoyi-system/src/main/resources/mapper/system/SqmyInfoMapper.xml

@@ -91,7 +91,8 @@
             <if test="sqmyUserId != null ">and sqmy_user_id = #{sqmyUserId}</if>
             <if test="isRead != null ">and is_read = #{isRead}</if>
             <if test="sqmyNumber != null  and sqmyNumber != ''">and sqmy_number = #{sqmyNumber}</if>
-            <if test="title != null  and title != ''">and title = #{title}</if>
+            <if test="title != null  and title != ''">and title like concat('%', #{title},
+                '%')</if>
             <if test="topicType != null  and topicType != ''">and topic_type = #{topicType}</if>
             <if test="lxrName != null  and lxrName != ''">and lxr_name like concat('%', #{lxrName}, '%')</if>
             <if test="lxrPhone != null  and lxrPhone != ''">and lxr_phone = #{lxrPhone}</if>
@@ -154,7 +155,8 @@
             <if test="topicType != null  and topicType != ''">and s.topic_type = #{topicType}</if>
             <if test="sqmyUserId != null ">and s.sqmy_user_id = #{sqmyUserId}</if>
             <if test="sqmyNumber != null  and sqmyNumber != ''">and s.sqmy_number = #{sqmyNumber}</if>
-            <if test="title != null  and title != ''">and s.title = #{title}</if>
+            <if test="title != null  and title != ''">and s.title like concat('%', #{title},
+                '%')</if>
             <if test="lxrName != null  and lxrName != ''">and s.lxr_name like concat('%', #{lxrName}, '%')</if>
             <if test="lxrPhone != null  and lxrPhone != ''">and s.lxr_phone = #{lxrPhone}</if>
             <if test="sqmyName != null  and sqmyName != ''">and s.sqmy_name like concat('%', #{sqmyName}, '%')</if>
@@ -197,7 +199,8 @@
             <if test="sqmyUserId != null ">and sqmy_user_id = #{sqmyUserId}</if>
             <if test="isRead != null ">and is_read = #{isRead}</if>
             <if test="sqmyNumber != null  and sqmyNumber != ''">and sqmy_number = #{sqmyNumber}</if>
-            <if test="title != null  and title != ''">and title = #{title}</if>
+            <if test="title != null  and title != ''">and title like concat('%', #{title},
+                '%')</if>
             <if test="topicType != null  and topicType != ''">and topic_type = #{topicType}</if>
             <if test="lxrName != null  and lxrName != ''">and lxr_name like concat('%', #{lxrName}, '%')</if>
             <if test="lxrPhone != null  and lxrPhone != ''">and lxr_phone = #{lxrPhone}</if>