shudonghui 1 year ago
parent
commit
6a5f9ce0fe

+ 2 - 0
sop-business/src/main/java/com/qmth/sop/business/bean/result/SysMessageWorkResult.java

@@ -24,6 +24,8 @@ public class SysMessageWorkResult implements Serializable {
     @ApiModelProperty(value = "消息类型")
     private MessageTypeEnum messageType;
 
+    @ApiModelProperty(value = "消息标题")
+    private String title;
 
     @ApiModelProperty(value = "消息内容")
     private String content;

+ 7 - 2
sop-business/src/main/resources/mapper/SysMessageMapper.xml

@@ -65,9 +65,11 @@
         c.type custom_type ,
         bs.name service,
         w.`status` delay_status,
-        w.warn_time
+        w.warn_time,
+        n.title
         FROM
         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
@@ -92,8 +94,11 @@
             <if test="serviceId != null and serviceId != ''">
                 and m.service_id = #{serviceId}
             </if>
+<!--            <if test="query != null and query != ''">-->
+<!--                and m.content like concat('%', #{query} , '%')-->
+<!--            </if>-->
             <if test="query != null and query != ''">
-                and m.content like concat('%', #{query} , '%')
+                and n.title like concat('%', #{query} , '%')
             </if>
             <if test="startTime != null and startTime != '' ">
                 <![CDATA[