From 8be0813e21a43fa06d049cb338c87949052df59a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Sat, 27 Jun 2026 19:00:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=92=E8=89=B2BUG?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/application/service/TokenLoginApplicationService.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mhd-auth/src/main/java/com/mhd/auth/app/application/service/TokenLoginApplicationService.java b/mhd-auth/src/main/java/com/mhd/auth/app/application/service/TokenLoginApplicationService.java
index 0814d4546..1698a9ed3 100644
--- a/mhd-auth/src/main/java/com/mhd/auth/app/application/service/TokenLoginApplicationService.java
+++ b/mhd-auth/src/main/java/com/mhd/auth/app/application/service/TokenLoginApplicationService.java
@@ -384,6 +384,10 @@ public class TokenLoginApplicationService {
                 throw new ServiceException("用户不存在/密码错误");
             }
         }
+        // 验证码登录时 userInfo.getUserPo() 可能为null，加保护
+        if (userInfo == null || userInfo.getUserPo() == null || userInfo.getUserPo().getOrganizationId() == null) {
+            throw new ServiceException("登录用户组织信息不完整，请联系管理员");
+        }
         R<OrganizationPo> organizationInfo = organizationServiceFeign.getInfoForIdList(userInfo.getUserPo().getOrganizationId());
         if (ObjectUtil.isNull(organizationInfo) || ObjectUtil.isNull(organizationInfo.getData())) {
             throw new ServiceException("登录用户组织不存在");