diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java
index 94ab1fb7c..05d2f5b1a 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/user/AdminUserMapper.java
@@ -14,6 +14,7 @@ import org.apache.ibatis.annotations.Mapper;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 
 @Mapper
 public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
@@ -50,11 +51,17 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
-                .likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname())
-                .or(StrUtil.isNotBlank(reqVO.getNickname()))
-                .likeIfPresent(AdminUserDO::getPinyinFull, reqVO.getPyAll())
-                .or(StrUtil.isNotBlank(reqVO.getNickname()))
-                .likeIfPresent(AdminUserDO::getPinyinInitial, reqVO.getPyFirstChar())
+                .and(StrUtil.isNotBlank(reqVO.getNickname()), wrapper -> {
+                    if (StrUtil.isNotBlank(reqVO.getPyAll())) {
+                        wrapper.or(Boolean.TRUE).like(AdminUserDO::getPinyinFull, reqVO.getPyAll()) ;
+                    }
+                    if (StrUtil.isNotBlank(reqVO.getPyFirstChar())) {
+                        wrapper.or(Boolean.TRUE).like(AdminUserDO::getPinyinInitial, reqVO.getPyFirstChar()) ;
+                    }
+                    if(StrUtil.isNotBlank(reqVO.getNickname())) {
+                        wrapper.or(Boolean.TRUE).like(AdminUserDO::getNickname, reqVO.getNickname()) ;
+                    }
+                })
                 .orderByDesc(AdminUserDO::getId));
     }