From 8a7af3c27dca7eb50898995d5f64547beccc9e24 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 七月 2026 10:25:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
index 3f87102..9da83b1 100644
--- a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
+++ b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
@@ -2,10 +2,10 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO;
import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -13,6 +13,7 @@
import java.util.List;
import java.util.stream.Collectors;
+import java.util.stream.IntStream;
/**
* 浼氬憳 User Mapper
@@ -26,6 +27,10 @@
return selectOne(MemberUserDO::getMobile, mobile);
}
+ default MemberUserDO selectByEmail(String email) {
+ return selectOne(MemberUserDO::getEmail, email);
+ }
+
default List<MemberUserDO> selectListByNicknameLike(String nickname) {
return selectList(new LambdaQueryWrapperX<MemberUserDO>()
.likeIfPresent(MemberUserDO::getNickname, nickname));
@@ -34,20 +39,23 @@
default PageResult<MemberUserDO> selectPage(MemberUserPageReqVO reqVO) {
// 澶勭悊 tagIds 杩囨护鏉′欢
String tagIdSql = "";
+ Object[] tagIdParams = new Object[0];
if (CollUtil.isNotEmpty(reqVO.getTagIds())) {
- tagIdSql = reqVO.getTagIds().stream()
- .map(tagId -> "FIND_IN_SET(" + tagId + ", tag_ids)")
+ tagIdSql = IntStream.range(0, reqVO.getTagIds().size())
+ .mapToObj(index -> MyBatisUtils.findInSetWithParamIndex("tag_ids", index))
.collect(Collectors.joining(" OR "));
+ tagIdParams = reqVO.getTagIds().toArray();
}
// 鍒嗛〉鏌ヨ
return selectPage(reqVO, new LambdaQueryWrapperX<MemberUserDO>()
.likeIfPresent(MemberUserDO::getMobile, reqVO.getMobile())
+ .likeIfPresent(MemberUserDO::getEmail, reqVO.getEmail())
.betweenIfPresent(MemberUserDO::getLoginDate, reqVO.getLoginDate())
.likeIfPresent(MemberUserDO::getNickname, reqVO.getNickname())
.betweenIfPresent(MemberUserDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(MemberUserDO::getLevelId, reqVO.getLevelId())
.eqIfPresent(MemberUserDO::getGroupId, reqVO.getGroupId())
- .apply(StrUtil.isNotEmpty(tagIdSql), tagIdSql)
+ .apply(CollUtil.isNotEmpty(reqVO.getTagIds()), tagIdSql, tagIdParams)
.orderByDesc(MemberUserDO::getId));
}
@@ -61,7 +69,7 @@
default Long selectCountByTagId(Long tagId) {
return selectCount(new LambdaQueryWrapperX<MemberUserDO>()
- .apply("FIND_IN_SET({0}, tag_ids)", tagId));
+ .apply(MyBatisUtils.findInSet("tag_ids"), tagId));
}
/**
--
Gitblit v1.9.3