首页通知公告 添加发布机构

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/message/mapper/CoreAnnouncementNotificationMapper.java

@@ -85,9 +85,13 @@ public interface CoreAnnouncementNotificationMapper extends BaseMapper<CoreAnnou
     void deleteOrg(@Param("notificationId") Long id);
 
     void deleteNotificationToUsers(@Param("notificationId") Long notificationId);
-List<MessageAppPageVo> selectAll(@Param("orgId") Long orgId,@Param("roles") Long[]roles);
+
+    List<MessageAppPageVo> selectAll(@Param("orgId") Long orgId, @Param("roles") Long[] roles);
+
     Page<MessageAppPageVo> selectAppPage(@Param("page") Page<MessageAppPageVo> page, @Param("request") CoreAnnouncementNotificationAppPageDto request);
-List<Long> selectReadByUser(Long userId);
+
+    List<Long> selectReadByUser(Long userId);
+
     List<CoreAnnouncementNotificationToUser> selectNotificationToUsers(@Param("request") CoreAnnouncementNotificationAppPageDto request, @Param("records") List<MessageAppPageVo> records);
 
     CoreAnnouncementNotificationToUser checkIsRead(@Param("request") CoreAnnouncementNotificationAppPageDto request);
@@ -95,5 +99,6 @@ List<Long> selectReadByUser(Long userId);
     void insertNotificationUser(@Param("notificationUser") CoreAnnouncementNotificationToUser notificationUser);
 
     Integer selectNoRead(Long userId);
-List<Long> selectAllTongZhi(@Param("orgId") Long orgId,@Param("orgType") Integer orgType,@Param("roles") Long[]roles);
+
+    List<Long> selectAllTongZhi(@Param("orgId") Long orgId, @Param("orgType") Integer orgType, @Param("roles") Long[] roles);
 }

soc-modules/soc-modules-core/src/main/resources/mapper/message/CoreAnnouncementNotificationMapper.xml

@@ -82,7 +82,7 @@
     </select>
     <select id="selectAppPage"
             resultType="com.xunmei.common.core.domain.message.vo.MessageAppPageVo">
-        select T.*,T.file_list as strFileList from (select a.* from core_announcement_notification a
+        select T.*,T.file_list as strFileList,T.org_name as publishOrg from (select a.* from core_announcement_notification a
                          left join core_announcement_notification_to_role b on a.id = b.announcement_notification_id
                          left join core_announcement_notification_to_org c on a.id = c.announcement_notification_id
                          where a.messag_status = 1 and c.org_id = #{request.orgId} and (a.messag_type = 0 or (b.role_id in