1、增加配置，system_notify_message_readinfo表暂不走多机构，移除DO中的organId；2、消息记录列表暂和我的消息走相同service实现；3、查询消息列表时userId作用于关联readinfo而不筛选message表本身

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyMessageController.java

@@ -46,6 +46,8 @@ public class NotifyMessageController {
     @Operation(summary = "获得站内信分页")
     @PreAuthorize("@ss.hasPermission('system:notify-message:query')")
     public CommonResult<PageResult<NotifyMessageRespVO>> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) {
+        pageVO.setUserId(getLoginUserId());
+        pageVO.setUserType(UserTypeEnum.ADMIN.getValue());
         PageResult<NotifyMessageDO> pageResult = notifyMessageService.getMyMyNotifyMessagePage(pageVO);
         return success(BeanUtils.toBean(pageResult, NotifyMessageRespVO.class));
     }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/notify/NotifyMessageReadInfoDO.java

@@ -29,11 +29,6 @@ public class NotifyMessageReadInfoDO {
     @TableId
     private Long id;
 
-    /**
-     * 组织id
-     */
-    private Long organId;
-
     /**
      * 站内信消息id
      */

cf-module-system/cf-module-system-biz/src/main/resources/application.yaml

@@ -187,6 +187,7 @@ chenfeng:
       - system_label_element_template
       - system_data_source
       - system_notify_message
+      - system_notify_message_readinfo
       - system_data_source_field
     use-data-code: imes_prod #动态数据源标识，后期添加的数据源需要修改此值
 

cf-module-system/cf-module-system-biz/src/main/resources/mapper/message/NotifyMessageMapper.xml

@@ -10,7 +10,7 @@
         coalesce(r.id is not null, true) as readStatus
         , r.read_time readTime
         from system_notify_message m
-        left join system_notify_message_readinfo r on r.message_id = m.id
+        left join system_notify_message_readinfo r on r.message_id = m.id and r.user_id = #{reqVo.userId}
         <where>
             <if test="reqVo.readStatus != null and reqVo.readStatus">
                 r.id is not null
@@ -30,7 +30,6 @@
             <if test="reqVo.templateType != null">
                 and m.template_type = #{reqVo.templateType}
             </if>
-            and m.user_id in (#{reqVo.userId},0)
         </where>
         order by m.id desc
     </select>
@@ -38,18 +37,16 @@
     <select id="getUnreadNotifyMessageCount" resultType="java.lang.Integer">
         select count(distinct m.id)
         from system_notify_message m
-                 left join system_notify_message_readinfo r on r.message_id = m.id
+                 left join system_notify_message_readinfo r on r.message_id = m.id and r.user_id = #{userId}
         where r.id is null
-          and m.user_id in (#{userId}, 0)
+        and m.user_type = #{userType}
-          and m.user_type = #{userType}
     </select>
 
     <select id="getUnreadNotifyMessageIds" resultType="java.lang.Long">
         select m.id
         from system_notify_message m
-                 left join system_notify_message_readinfo r on r.message_id = m.id
+                 left join system_notify_message_readinfo r on r.message_id = m.id and r.user_id = #{userId}
         where r.id is null
-          and m.user_id in (#{userId}, 0)
+        and m.user_type = #{userType}
-          and m.user_type = #{userType}
     </select>
 </mapper>