From 0486498f5d55cc467b430c946183e8b9c8ca6fd2 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Mon, 3 Aug 2020 16:26:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B3=A8=E5=86=8C=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../toesbieya/jxc/account/controller/AccountController.java  | 2 +-
 .../cn/toesbieya/jxc/account/service/AccountService.java     | 1 +
 .../java/cn/toesbieya/jxc/controller/AccountController.java  | 2 +-
 .../main/java/cn/toesbieya/jxc/service/AccountService.java   | 1 +
 vue/src/api/account.js                                       | 5 ++++-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/controller/AccountController.java b/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/controller/AccountController.java
index 0b39b55..b1197cc 100644
--- a/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/controller/AccountController.java
+++ b/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/controller/AccountController.java
@@ -76,7 +76,7 @@ public class AccountController {
             return Result.success();
         }
 
-        return Result.success(service.checkName(name, id) ? null : "该用户名已存在");
+        return Result.success(service.checkName(name, id) ? "该用户名已存在" : null);
     }
 
     private String validateUpdatePwdParam(PasswordUpdateParam vo) {
diff --git a/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/service/AccountService.java b/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/service/AccountService.java
index 1ee03bb..f0a7a15 100644
--- a/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/service/AccountService.java
+++ b/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/service/AccountService.java
@@ -223,6 +223,7 @@ public class AccountService {
         return Result.fail("上传头像失败");
     }
 
+    //用户名重复时返回true
     public boolean checkName(String name, Integer id) {
         Integer num = userMapper.selectCount(
                 Wrappers.lambdaQuery(SysUser.class)
diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java
index 5167612..00faf7d 100644
--- a/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java
+++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java
@@ -75,7 +75,7 @@ public class AccountController {
             return Result.success();
         }
 
-        return Result.success(service.checkName(name, id) ? null : "该用户名已存在");
+        return Result.success(service.checkName(name, id) ? "该用户名已存在" : null);
     }
 
     private String validateUpdatePwdParam(PasswordUpdateParam vo) {
diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java
index 0f378e1..a25d285 100644
--- a/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java
+++ b/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java
@@ -211,6 +211,7 @@ public class AccountService {
         return Result.fail("上传头像失败");
     }
 
+    //用户名重复时返回true
     public boolean checkName(String name, Integer id) {
         Integer num = userMapper.selectCount(
                 Wrappers.lambdaQuery(SysUser.class)
diff --git a/vue/src/api/account.js b/vue/src/api/account.js
index e012470..145a18b 100644
--- a/vue/src/api/account.js
+++ b/vue/src/api/account.js
@@ -1,4 +1,5 @@
 import request from "@/config/request"
+import {isEmpty} from "@/utils"
 
 export const baseUrl = '/account'
 
@@ -27,5 +28,7 @@ export function validate(pwd) {
 }
 
 export function checkName(name, id) {
-    return request.get(`${baseUrl}/checkName?name=${name}&id=${id}`).then(({data}) => data)
+    let param = `?name=${name}`
+    if (!isEmpty(id)) param += `&id=${id}`
+    return request.get(`${baseUrl}/checkName${param}`).then(({data}) => data)
 }