默认用户是本组织的
This commit is contained in:
+7
-1
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user