From d85ec778237cd9af68c8d6b96895d22e0cf158df Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 02 十一月 2026 14:15:17 +0800
Subject: [PATCH] fix(hrm/system): 修复调岗申请与提交报错、公积金误扣、用户搜索，新增核算批量删除
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..bde2c9e 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,6 @@
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;
@@ -26,7 +27,14 @@
}
default PageResult<AdminUserDO> selectPage(UserPageReqVO reqVO, Collection<Long> deptIds, Collection<Long> userIds) {
- return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
+ LambdaQueryWrapperX<AdminUserDO> wrapper = new LambdaQueryWrapperX<>();
+ // 鍏抽敭璇嶏細鍚屾椂妯＄硦鍖归厤銆岃处鍙枫�嶄笌銆屽鍚嶃�嶏紝渚涢�夋嫨鐢ㄦ埛寮圭獥鐨勬悳绱㈡浣跨敤
+ if (StrUtil.isNotBlank(reqVO.getKeyword())) {
+ String keyword = reqVO.getKeyword().trim();
+ wrapper.and(w -> w.like(AdminUserDO::getUsername, keyword)
+ .or().like(AdminUserDO::getNickname, keyword));
+ }
+ return selectPage(reqVO, wrapper
.likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
.likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
.eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
--
Gitblit v1.9.3