From 9e8ce689c89c4b03bfc67a60d7da13a7d593725a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 20:33:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
index 6c71237..237c92c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
@@ -205,8 +205,13 @@
 
         // 判断账号是否重复
         //Check if the account is duplicated
-        User theUser = userService.getByAccount(user.getAccount());
-        if (theUser != null) {
+        User theUser = new User();
+        if (user.getAccount()!=""){
+         theUser = userService.getByAccount(user.getAccount());
+
+        }
+        System.out.println("=====theUser======="+theUser);
+        if (theUser != null&&user.getAccount()!="") {
             throw new GunsException(BizExceptionEnum.USER_ALREADY_REG);
         }
 

--
Gitblit v1.7.1