diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java index f749fa7..632037f 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java @@ -101,6 +101,7 @@ public class AdminUserServiceImpl implements AdminUserService { } }); createReqVO.setUsername(createReqVO.getEmail()); + validateUsernameUnique(null,createReqVO.getUsername()); // 1.2 校验正确性 validateUserForCreateOrUpdate(null, createReqVO.getUsername(), createReqVO.getMobile(), createReqVO.getEmail(), createReqVO.getDeptId(), createReqVO.getPostIds()); @@ -394,7 +395,9 @@ public class AdminUserServiceImpl implements AdminUserService { } // 如果 id 为空,说明不用比较是否为相同 id 的用户 if (id == null) { - throw exception(USER_USERNAME_EXISTS); + if(username.equals(user.getUsername())){ + throw exception(USER_USERNAME_EXISTS); + } } if (!user.getId().equals(id)) { throw exception(USER_USERNAME_EXISTS); diff --git a/hangtag-ui/hangtag-ui-admin/src/views/system/user/UserForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/system/user/UserForm.vue index c854698..301e47e 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/system/user/UserForm.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/system/user/UserForm.vue @@ -130,7 +130,7 @@ const formLoading = ref(false) // 表单的加载中:1)修改时的数据加 const formType = ref('') // 表单的类型:create - 新增;update - 修改 const formData = ref({ nickname: '', - deptId: '', + deptId: 100, mobile: '', email: '', id: undefined, @@ -221,7 +221,7 @@ const submitForm = async () => { const resetForm = () => { formData.value = { nickname: '', - deptId: '', + deptId: 100, mobile: '', email: '', id: undefined,