summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangshuai <[email protected]>2023-10-27 10:48:34 +0800
committerzhangshuai <[email protected]>2023-10-27 10:48:34 +0800
commit789fd1f0f9662bb6eee218871a9f37009783c485 (patch)
treecb819b208cc0f46710ce8a444b162b212d153113
parentd75eaac3efebcd8491c94bf36aee77445058f383 (diff)
fix: NEZ-3261 修复 UserName 重复时错误信息不准确rel-23.10.07
-rw-r--r--nz-admin/src/main/java/com/nis/modules/sys/service/impl/SysUserServiceImpl.java4
-rw-r--r--nz-common/src/main/java/com/nis/common/utils/RCode.java1
2 files changed, 5 insertions, 0 deletions
diff --git a/nz-admin/src/main/java/com/nis/modules/sys/service/impl/SysUserServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/sys/service/impl/SysUserServiceImpl.java
index 2785b76c..74408293 100644
--- a/nz-admin/src/main/java/com/nis/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/sys/service/impl/SysUserServiceImpl.java
@@ -153,6 +153,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
throw new NZException(RCode.SYS_USER_NAME_DUPLICATE);
}
+ List<SysUserEntity> listByUserName = this.list(new QueryWrapper<SysUserEntity>().lambda().eq(SysUserEntity::getUsername, user.getUsername()).ne(ObjectUtil.isNotEmpty(user.getId()),SysUserEntity::getId, user.getId()));
+ if(ObjectUtil.isNotEmpty(listByUserName)) {
+ throw new NZException(RCode.SYS_USER_USERNAME_DUPLICATE);
+ }
if(status != 0 && status != 1){
throw new NZException(RCode.SYS_USER_STATUS_INVALIDE);
}
diff --git a/nz-common/src/main/java/com/nis/common/utils/RCode.java b/nz-common/src/main/java/com/nis/common/utils/RCode.java
index d308a871..c391372a 100644
--- a/nz-common/src/main/java/com/nis/common/utils/RCode.java
+++ b/nz-common/src/main/java/com/nis/common/utils/RCode.java
@@ -612,6 +612,7 @@ public enum RCode {
SYS_USER_NEWPWD_ISNULL(511049, "User new password can not be empty"), //新密码不能为空
SYS_USER_QUERY_KEY_ISNULL(511050,"Query key can not be empty"),
SYS_USER_QUERY_VALUE_ISNULL(511051,"Query value can not be empty"),
+ SYS_USER_USERNAME_DUPLICATE(511052,"System user userName duplicate"),
AGENT_ID_ISNULL(521000, "Agent id can not be empty"),
AGENT_DCID_ISNULL(521001, "Agent Dc id can not be empty"),