默认用户是本组织的

This commit is contained in:
秦鸿展
2026-07-01 19:34:28 +08:00
parent ec43b3be8a
commit 8c9ef2f083
@@ -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());