修改sql公告

sooka-jnb/src/main/resources/mapper/my/AnnouncementMapper.xml

@@ -32,21 +32,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM jnb_announcement a
         LEFT JOIN jnb_announcement_read ar ON a.id = ar.anno_id
         <where>
-            and del_flag = 1
+            and a.del_flag = 1
             <if test="announcementTitle != null  and announcementTitle != ''">
-                and announcement_title like concat('%', #{announcementTitle}, '%')
+                and a.announcement_title like concat('%', #{announcementTitle}, '%')
             </if>
             <if test="validityStartTime != null">
-                and validity_start_time &gt;= #{validityStartTime}
+                and a.validity_start_time &gt;= #{validityStartTime}
             </if>
             <if test="validityEndTime != null ">
-                and (validity_end_time &lt;= #{validityEndTime} or validity_end_time is null)
+                and (a.validity_end_time &lt;= #{validityEndTime} or a.validity_end_time is null)
             </if>
             <if test="userId != null  and userId != ''">
                 and (a.user_id = #{userId} or a.user_id is null)
-                and (validity_end_time &gt;= DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00') or validity_end_time is null)
+                and (a.validity_end_time &gt;= DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00') or a.validity_end_time is null)
             </if>
         </where>
+        group by
+            a.id
         order by a.validity_start_time desc
     </sql>