代码微调

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java

@@ -271,7 +271,7 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
 	 * @author zxc
 	 * @date 2021/4/21 上午9:45
 	 */
-	List<UserReadFlagResultDTO> selectUserReadFlag(@Param("groupId")String groupId,@Param("userId")String userId,@Param("ids")List<String> ids);
+	List<UserReadFlagResultDTO> selectUserReadFlag(@Param("userId")String userId,@Param("ids")List<String> ids);
 
 	/**
 	 * @Description  根据 活动或通知查询 未读人数

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -2345,7 +2345,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         List<String> ids = latestTenData.stream().map(m -> m.getId()).collect(Collectors.toList());
         List<UserInfoResultDTO> userInfos = disPoseUserInfo(result.getGroupType(), userIds);
         // 查询用户的 活动或通知的 阅读状态
-        List<UserReadFlagResultDTO> userReadFlag = resiGroupDao.selectUserReadFlag(groupId, userId, ids);
+        List<UserReadFlagResultDTO> userReadFlag = resiGroupDao.selectUserReadFlag( userId, ids);
         // 查询小组下的 通知或活动 未读人数
         List<UserUnReadResultDTO> userUnReadCount = resiGroupDao.selectUserUnReadById(groupId, ids);
         latestTenData.forEach(l -> {
@@ -2365,7 +2365,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             // 用户已读，未读
             if (!CollectionUtils.isEmpty(userReadFlag)){
                 userReadFlag.forEach(u -> {
-                    if (l.getUserId().equals(u.getUserId()) && l.getId().equals(u.getId())){
+                    if (l.getId().equals(u.getId())){
                         l.setReadOrUnRead(u.getReadFlag());
                     }
                 });

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -649,7 +649,6 @@
                    GROUP_ACT_ID = #{id}
                </foreach>
         )
-           AND GROUP_ID = #{groupId}
         )
         UNION ALL
         (SELECT
@@ -665,7 +664,6 @@
                    NOTICE_ID = #{id}
                </foreach>
         )
-           AND GROUP_ID = #{groupId}
         )
     </select>