用户名查询修改

This commit is contained in:
lym
2024-10-17 17:44:12 +08:00
parent 0b1ee27f0a
commit 0b0d17b94b
3 changed files with 1 additions and 8 deletions
@@ -26,10 +26,6 @@ public class UserPageReqVO extends PageParam {
@Size(max = 30, message = "用户昵称长度不能超过30个字符") @Size(max = 30, message = "用户昵称长度不能超过30个字符")
private String nickname; private String nickname;
@Schema(description = "用户账号")
@Size(max = 30, message = "用户账号长度不能超过30个字符")
private String username;
@Schema(description = "手机号码,模糊匹配", example = "chenfeng") @Schema(description = "手机号码,模糊匹配", example = "chenfeng")
@Mobile @Mobile
@Size(max = 11, message = "手机号码长度不能超过11个字符") @Size(max = 11, message = "手机号码长度不能超过11个字符")
@@ -77,7 +77,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
lambdaQueryWrapperX.eqIfPresent(AdminUserDO::getOrganId, loginUser.getOrganId()); lambdaQueryWrapperX.eqIfPresent(AdminUserDO::getOrganId, loginUser.getOrganId());
} }
return selectPage(reqVO, lambdaQueryWrapperX return selectPage(reqVO, lambdaQueryWrapperX
.likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername()) .likeIfPresent(AdminUserDO::getUsername, reqVO.getMobile())
.eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus()) .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
.betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
.inIfPresent(AdminUserDO::getDeptId, deptIds) .inIfPresent(AdminUserDO::getDeptId, deptIds)
@@ -393,9 +393,6 @@ public class AdminUserServiceImpl implements AdminUserService {
if (StringUtils.isNotBlank(reqVO.getNickname())) { if (StringUtils.isNotBlank(reqVO.getNickname())) {
reqVO.setPyFirstChar(PinYinUtils.convertFirstChar(reqVO.getNickname())); reqVO.setPyFirstChar(PinYinUtils.convertFirstChar(reqVO.getNickname()));
reqVO.setPyAll(PinYinUtils.convertToPinyin(reqVO.getNickname()).replace(" ", "")); reqVO.setPyAll(PinYinUtils.convertToPinyin(reqVO.getNickname()).replace(" ", ""));
} else if (StringUtils.isNotBlank((reqVO.getUsername()))) {
reqVO.setPyFirstChar(PinYinUtils.convertFirstChar(reqVO.getUsername()));
reqVO.setPyAll(PinYinUtils.convertToPinyin(reqVO.getUsername()).replace(" ", ""));
} else { } else {
// 避免name为空外部传入拼音查询字段 // 避免name为空外部传入拼音查询字段
reqVO.setPyFirstChar(null); reqVO.setPyFirstChar(null);