fix(search): 修复多处搜索条件未生效的问题

liu

2026-10-26 dddc473c582e983674913163dd4e93f840effbdb

 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));
    }