open-source/MallChat
1
0
Fork 0
mirror of https://github.com/zongzibinbin/MallChat.git synced 2026-03-13 13:43:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #141 from djc-github/main

Browse Source 
fix: Room.isRoomFriend
This commit is contained in:
zongzibinbin
2023-10-16 21:08:44 +08:00
committed by GitHub
parent 83394a8f35 b8d3cb6d91
commit 70152aaade
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java
View File

@@ -2,7 +2,7 @@ package com.abin.mallchat.common.chat.dao;
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 class MessageMarkDao extends ServiceImpl<MessageMarkMapper, MessageMark>
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<MessageMark> getValidMarkByMsgIdBatch(List<Long> msgIds) {
return lambdaQuery()
.in(MessageMark::getMsgId, msgIds)
.eq(MessageMark::getStatus, YesOrNoEnum.NO.getStatus())
.eq(MessageMark::getStatus, NormalOrNoEnum.NORMAL.getStatus())
.list();
}
}

2
mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java
View File

@@ -92,6 +92,6 @@ public class Room implements Serializable {
@JsonIgnore
public boolean isRoomGroup() {
return RoomTypeEnum.of(this.hotFlag) == RoomTypeEnum.GROUP;
return RoomTypeEnum.of(this.type) == RoomTypeEnum.GROUP;
}
}