From 4e8f5527259801d18b02f98d38bfe23eb2afc558 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 18 十月 2023 09:48:10 +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 |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 e097d63..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,7 +205,11 @@
 
         // 判断账号是否重复
         //Check if the account is duplicated
-        User theUser = userService.getByAccount(user.getAccount());
+        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