From b51bc178384110f773872aa7d2364322afdb8381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Mon, 29 Jun 2026 15:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5YMS=E7=94=A8=E6=88=B7BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/UserApplicationService.java           | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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 f110fb4f1..8e66812ac 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
@@ -1872,13 +1872,8 @@ public class UserApplicationService {
             } catch (Exception e) {
                 log.warn("同步商城用户失败，但不影响用户保存: {}", e.getMessage());
             }
-            //同步YMS平台员工信息
-            try {
-                ymsDomainService.addOrEditYmsUser(userEntity);
-            } catch (Exception e) {
-                log.warn("同步YMS平台员工信息失败，但不影响用户保存: {}", e.getMessage());
-            }
             //给小程序注册用户分配默认普通用户角色（must）
+            userEntity.setUserPassword("Aa123456"); // YMS同步需要密码
             try {
                 RoleDo mustRoleDo = new RoleDo();
                 mustRoleDo.setRoleCode(RoleEnum.MUST.getCode());
@@ -1896,6 +1891,8 @@ public class UserApplicationService {
                     }
                     userDO.setRoleCode(RoleEnum.MUST.getCode());
                     userDO.setRoleName(RoleEnum.MUST.getName());
+                    userEntity.setRoleCode(RoleEnum.MUST.getCode());
+                    userEntity.setRoleName(RoleEnum.MUST.getName());
                 }
             } catch (Exception e) {
                 log.warn("分配默认角色失败，但不影响用户保存: {}", e.getMessage());
@@ -1905,6 +1902,12 @@ public class UserApplicationService {
                     .set(UserEntity::getRoleCode, userDO.getRoleCode())
                     .set(UserEntity::getRoleName, userDO.getRoleName())
                     .eq(UserEntity::getUserId, userEntity.getUserId()));
+            //同步YMS平台员工信息（放在角色分配之后，确保roleCode已设置）
+            try {
+                ymsDomainService.addOrEditYmsUser(userEntity);
+            } catch (Exception e) {
+                log.warn("同步YMS平台员工信息失败，但不影响用户保存: {}", e.getMessage());
+            }
             //2024年3月27日16:40:15 处理用户验证码注册，首次登录redis用户数据不更新问题
             //此处根据id重新查询
             return userDomainService.selectByUserId(userEntity.getUserId());