From 7abf9f290c39dd20f865be53dbecee7fab6de140 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 19:12:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java | 7 +++++++
1 files changed, 7 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 a24a610..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;
@@ -34,6 +36,11 @@
.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