diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserPageReqVO.java index 826cd19f9..b2894f8ab 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserPageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserPageReqVO.java @@ -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个字符") 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 e96587ce2..8adbe4513 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 @@ -77,7 +77,7 @@ public interface AdminUserMapper extends BaseMapperX { lambdaQueryWrapperX.eqIfPresent(AdminUserDO::getOrganId, loginUser.getOrganId()); } return selectPage(reqVO, lambdaQueryWrapperX - .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername()) + .likeIfPresent(AdminUserDO::getUsername, reqVO.getMobile()) .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus()) .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime()) .inIfPresent(AdminUserDO::getDeptId, deptIds) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java index d4cecfcd8..9eb38dd04 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java @@ -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);