bug修改
This commit is contained in:
1 parent
928cb4a26a
commit
79692a8b15
2 files changed
+9
No files matched your search
+5
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.IterUtil;
|
|||||||
import cn.hutool.core.date.DatePattern;
|
import cn.hutool.core.date.DatePattern;
|
||||||
import cn.hutool.core.date.LocalDateTimeUtil;
|
import cn.hutool.core.date.LocalDateTimeUtil;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
|
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
|
||||||
import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
|
import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
|
||||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||||
import cn.iocoder.yudao.module.member.client.service.ChatApi;
|
import cn.iocoder.yudao.module.member.client.service.ChatApi;
|
||||||
@@ -777,6 +778,10 @@ public class RecentServiceImpl implements RecentService {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public RecentPageResVo getRecentUserByUserId(Long operateUserId, Long userId) {
|
public RecentPageResVo getRecentUserByUserId(Long operateUserId, Long userId) {
|
||||||
|
MemberUserDO targetUser = memberUserService.getUser(userId);
|
||||||
|
if (targetUser == null || CommonStatusEnum.isDisable(targetUser.getStatus())) {
|
||||||
|
throw exception(MemberErrorCode.USER_NOT_EXISTS);
|
||||||
|
}
|
||||||
// 判断当前操作用户是不是VIP
|
// 判断当前操作用户是不是VIP
|
||||||
boolean isVip = openTypeService.isUserOpenType(operateUserId);
|
boolean isVip = openTypeService.isUserOpenType(operateUserId);
|
||||||
|
|
||||||
|
|||||||
@@ -80,6 +80,8 @@
|
|||||||
left join member_user u on a.member_id = u.id
|
left join member_user u on a.member_id = u.id
|
||||||
<where>
|
<where>
|
||||||
<include refid="whereA"/>
|
<include refid="whereA"/>
|
||||||
|
<!-- 排除已禁用会员(CommonStatusEnum.DISABLE=1) -->
|
||||||
|
and u.status = 0
|
||||||
<if test="dto.memberSex != null">
|
<if test="dto.memberSex != null">
|
||||||
and u.sex = #{dto.memberSex}
|
and u.sex = #{dto.memberSex}
|
||||||
</if>
|
</if>
|
||||||
@@ -131,6 +133,8 @@
|
|||||||
left join member_open_type_user otu on u.id = otu.member_id
|
left join member_open_type_user otu on u.id = otu.member_id
|
||||||
<where>
|
<where>
|
||||||
u.deleted = 0
|
u.deleted = 0
|
||||||
|
<!-- 排除已禁用会员(CommonStatusEnum.DISABLE=1) -->
|
||||||
|
and u.status = 0
|
||||||
<if test="dto.memberSex != null">
|
<if test="dto.memberSex != null">
|
||||||
and u.sex = #{dto.memberSex}
|
and u.sex = #{dto.memberSex}
|
||||||
</if>
|
</if>
|
||||||
|
|||||||
Reference in new issue
Block a user