From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index b6d5e1b..54ba793 100644
--- a/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -187,7 +187,7 @@
 //                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
 //            }
 //        }
-        if ("admin".equals(user.getUsername()) && Objects.equal(systemUser.getStatus(),1)){
+        if (user != null && "admin".equals(user.getUsername()) && Objects.equal(systemUser.getStatus(),1)){
             throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瓒呯骇绠$悊鍛樿处鍙蜂笉鍏佽绂佺敤");
         }
         // 淇敼鐢ㄦ埛

--
Gitblit v1.9.3