Merge remote-tracking branch 'origin/main'

This commit is contained in:
liuzhaotian
2024-10-18 10:13:11 +08:00
20 changed files with 97 additions and 212 deletions
@@ -26,10 +26,6 @@ public class UserPageReqVO extends PageParam {
@Size(max = 30, message = "用户昵称长度不能超过30个字符")
private String nickname;
@Schema(description = "用户账号")
@Size(max = 30, message = "用户账号长度不能超过30个字符")
private String username;
@Schema(description = "手机号码,模糊匹配", example = "chenfeng")
@Mobile
@Size(max = 11, message = "手机号码长度不能超过11个字符")
@@ -393,9 +393,6 @@ public class AdminUserServiceImpl implements AdminUserService {
if (StringUtils.isNotBlank(reqVO.getNickname())) {
reqVO.setPyFirstChar(PinYinUtils.convertFirstChar(reqVO.getNickname()));
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 {
// 避免name为空外部传入拼音查询字段
reqVO.setPyFirstChar(null);