From 00ea325ebfe87f0bcdbad49e1b5c9b6347a56e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 22 Jan 2026 11:06:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(auth):=20=E8=A7=A3=E5=86=B3=E8=B6=85?=
 =?UTF-8?q?=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E6=9D=83=E9=99=90=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 Boolean 对象转换为 boolean 原始类型以避免拆箱时的 NPE
- 使用 Boolean.TRUE.equals() 方法安全地处理可能为 null 的值
- 添加注释说明 null 值的处理逻辑
- 在两个用户注册相关的方法中统一了相同的修复方式
---
 .../gxwebsoft/common/system/controller/MainController.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index a01a2b5..0bb4dbb 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -626,7 +626,8 @@ public class MainController extends BaseController {
     String password = user.getPassword();          // 密码
     String code = user.getCode();                  // 短信验证码
     String email = user.getEmail();                // 邮箱
-    final Boolean isAdmin = user.getIsSuperAdmin();     // 是否注册为超级管理员(是=>创建租户)
+    // Treat null as false to avoid NPE when unboxing Boolean in conditions.
+    final boolean isAdmin = Boolean.TRUE.equals(user.getIsSuperAdmin());     // 是否注册为超级管理员(是=>创建租户)
 
     if (!isAdmin) {
       // 短信验证
@@ -784,7 +785,8 @@ public class MainController extends BaseController {
     String password = user.getPassword();          // 密码
     String code = user.getCode();                  // 短信验证码
     String email = user.getEmail();                // 邮箱
-    final Boolean isAdmin = user.getIsSuperAdmin();     // 是否注册为超级管理员(是=>创建租户)
+    // Treat null as false to avoid NPE when unboxing Boolean in conditions.
+    final boolean isAdmin = Boolean.TRUE.equals(user.getIsSuperAdmin());     // 是否注册为超级管理员(是=>创建租户)
 
     // 会员资料
     final UserParam userParam = new UserParam();