Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/resources/mapper/SysMessageMapper.xml

@@ -83,10 +83,11 @@
         sys_message m
         LEFT JOIN sys_notice n ON n.id = m.notice_id
         LEFT JOIN sys_user u ON u.id = m.form_user_id
-        LEFT JOIN sys_custom c ON c.manager_id = m.receive_user_id
         LEFT JOIN t_b_service bs ON bs.id = m.service_id
-<!--        left join t_b_delay_warn w on w.crm_no=m.crm_no-->
-        left join t_b_delay_warn w on w.message_id=m.id
+        left join t_b_delay_warn w on w.crm_no=m.crm_no
+<!--        left join t_b_delay_warn w on w.message_id=m.id-->
+        left join t_b_crm crm on crm.crm_no=m.crm_no
+        LEFT JOIN sys_custom c ON c.id = crm.custom_id
         <where>
             <if test="userId != null and userId != ''">
                 and m.receive_user_id = #{userId}

sop-business/src/main/resources/mapper/TBUserArchivesAllocationMapper.xml

@@ -90,7 +90,7 @@
                 AND result.area LIKE CONCAT('%',#{area},'%')
             </if>
             <if test="customName != null and customName != ''">
-                AND result.customName LIKE CONCAT('%',#{customName}.'%')
+                AND result.customName LIKE CONCAT('%',#{customName},'%')
             </if>
             <if test="gap != null">
                 AND (result.coordinatorUnDistributed + result.effectUnDistributed + result.assistantUnDistributed) &lt;= #{gap}
@@ -199,7 +199,7 @@
                 AND result.area LIKE CONCAT('%',#{area},'%')
             </if>
             <if test="customName != null and customName != ''">
-                AND result.customName LIKE CONCAT('%',#{customName}.'%')
+                AND result.customName LIKE CONCAT('%',#{customName},'%')
             </if>
             <if test="gap != null">
                 AND (result.coordinatorUnDistributed + result.effectUnDistributed + result.assistantUnDistributed) &lt;= #{gap}