diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java index 5361ef01..bb7d4f47 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java @@ -2,7 +2,7 @@ import com.abin.mallchat.common.chat.domain.entity.MessageMark; import com.abin.mallchat.common.chat.mapper.MessageMarkMapper; -import com.abin.mallchat.common.common.domain.enums.YesOrNoEnum; +import com.abin.mallchat.common.common.domain.enums.NormalOrNoEnum; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -29,14 +29,14 @@ public MessageMark get(Long uid, Long msgId, Integer markType) { public Integer getMarkCount(Long msgId, Integer markType) { return lambdaQuery().eq(MessageMark::getMsgId, msgId) .eq(MessageMark::getType, markType) - .eq(MessageMark::getStatus, YesOrNoEnum.NO.getStatus()) + .eq(MessageMark::getStatus, NormalOrNoEnum.NORMAL.getStatus()) .count(); } public List getValidMarkByMsgIdBatch(List msgIds) { return lambdaQuery() .in(MessageMark::getMsgId, msgIds) - .eq(MessageMark::getStatus, YesOrNoEnum.NO.getStatus()) + .eq(MessageMark::getStatus, NormalOrNoEnum.NORMAL.getStatus()) .list(); } } diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java index cbcfe886..029bf147 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java @@ -92,6 +92,6 @@ public boolean isRoomFriend() { @JsonIgnore public boolean isRoomGroup() { - return RoomTypeEnum.of(this.hotFlag) == RoomTypeEnum.GROUP; + return RoomTypeEnum.of(this.type) == RoomTypeEnum.GROUP; } }