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());