From 8c9ef2f083695748abe07ed6e3e2f3aa3b84fcf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Wed, 1 Jul 2026 19:34:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=94=A8=E6=88=B7=E6=98=AF?=
 =?UTF-8?q?=E6=9C=AC=E7=BB=84=E7=BB=87=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/application/service/UserApplicationService.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java
index 3ded3381e..0c30b3f42 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java
@@ -1860,13 +1860,19 @@ public class UserApplicationService {
                 userDO.setUserName("用户" + userDO.getUserPhone().substring(userDO.getUserPhone().length() - 4));
             }
             UserEntity userEntity = userDomainService.addUser(userDO);
-            //给小程序注册用户分配默认普通用户角色（must）
+            //给小程序注册用户分配默认普通用户角色（must），本组织没有则找上级
             userEntity.setUserPassword("Aa123456"); // 三方同步需要密码
             try {
                 RoleDo mustRoleDo = new RoleDo();
                 mustRoleDo.setRoleCode(RoleEnum.MUST.getCode());
                 mustRoleDo.setOrganizationId(userEntity.getOrganizationId());
                 RoleEntity mustRoleEntity = roleDomainService.selectByOrganizationIdAndRoleCode(mustRoleDo);
+                // 本组织没有，找上级组织
+                if (null == mustRoleEntity && userEntity.getTopOrganizationId() != null
+                        && !userEntity.getTopOrganizationId().equals(userEntity.getOrganizationId())) {
+                    mustRoleDo.setOrganizationId(userEntity.getTopOrganizationId());
+                    mustRoleEntity = roleDomainService.selectByOrganizationIdAndRoleCode(mustRoleDo);
+                }
                 if (null != mustRoleEntity) {
                     UserRoleDo mustUserRoleDo = new UserRoleDo();
                     mustUserRoleDo.setUserId(userEntity.getUserId());