From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java
index c0c9be8..3e8b2be 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java
@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.system.dal.mysql.user;
+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;
@@ -28,11 +30,17 @@
default PageResult<AdminUserDO> selectPage(UserPageReqVO reqVO, Collection<Long> deptIds, Collection<Long> userIds) {
return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
.likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
+ .likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname())
.likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
.eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
.betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
.inIfPresent(AdminUserDO::getDeptId, deptIds)
.inIfPresent(AdminUserDO::getId, userIds)
+ // keyword锛氳处鍙锋垨鏄电О浠讳竴鍖归厤銆傛敞鎰忔斁鍦ㄩ摼灏撅細and() 杩斿洖鍩虹 Wrapper锛屼細涓㈠け likeIfPresent 绛夋墿灞曟柟娉�
+ .and(StrUtil.isNotBlank(reqVO.getKeyword()), wrapper -> wrapper
+ .like(AdminUserDO::getUsername, reqVO.getKeyword())
+ .or()
+ .like(AdminUserDO::getNickname, reqVO.getKeyword()))
.orderByDesc(AdminUserDO::getId));
}
--
Gitblit v1.9.3