diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java index 0818935a1c..e372cd4d70 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java +++ b/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 { * @author zxc * @date 2021/4/21 上午9:45 */ - List selectUserReadFlag(@Param("groupId")String groupId,@Param("userId")String userId,@Param("ids")List ids); + List selectUserReadFlag(@Param("userId")String userId,@Param("ids")List ids); /** * @Description 根据 活动或通知查询 未读人数 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 79a5172bd5..fcf366c789 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/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 ids = latestTenData.stream().map(m -> m.getId()).collect(Collectors.toList()); List userInfos = disPoseUserInfo(result.getGroupType(), userIds); // 查询用户的 活动或通知的 阅读状态 - List userReadFlag = resiGroupDao.selectUserReadFlag(groupId, userId, ids); + List userReadFlag = resiGroupDao.selectUserReadFlag( userId, ids); // 查询小组下的 通知或活动 未读人数 List userUnReadCount = resiGroupDao.selectUserUnReadById(groupId, ids); latestTenData.forEach(l -> { @@ -2365,7 +2365,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl { - if (l.getUserId().equals(u.getUserId()) && l.getId().equals(u.getId())){ + if (l.getId().equals(u.getId())){ l.setReadOrUnRead(u.getReadFlag()); } }); diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 49c73e454b..59c565d694 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -649,7 +649,6 @@ GROUP_ACT_ID = #{id} ) - AND GROUP_ID = #{groupId} ) UNION ALL (SELECT @@ -665,7 +664,6 @@ NOTICE_ID = #{id} ) - AND GROUP_ID = #{groupId} )