小程序新增默认角色BUG修改
This commit is contained in:
@@ -12,9 +12,13 @@ import com.mhd.common.log.enums.BusinessType;
|
||||
import com.mhd.user.application.service.UserApplicationService;
|
||||
import com.mhd.user.application.service.UserDriverApplicationService;
|
||||
import com.mhd.user.application.service.UserShipperApplicationService;
|
||||
import com.mhd.user.domain.roleAggregate.repository.todo.RoleDo;
|
||||
import com.mhd.user.domain.userAggregate.repository.po.UserDocumentWarningQueryPo;
|
||||
import com.mhd.user.domain.userAggregate.repository.todo.*;
|
||||
import com.mhd.user.domain.userAggregate.service.UserRoleDomainService;
|
||||
import com.mhd.user.domain.roleAggregate.service.RoleDomainService;
|
||||
import com.mhd.user.domain.roleAggregate.entity.RoleEntity;
|
||||
import com.mhd.common.core.enums.RoleEnum;
|
||||
import com.mhd.user.interfaces.assember.*;
|
||||
import com.mhd.user.interfaces.dto.addDTO.*;
|
||||
import com.mhd.user.interfaces.dto.queryDTO.UserDataPermissionQueryDTO;
|
||||
@@ -75,6 +79,9 @@ public class UserAPI extends BaseController {
|
||||
@Autowired
|
||||
private UserRoleDomainService userRoleDomainService;
|
||||
|
||||
@Resource
|
||||
private RoleDomainService roleDomainService;
|
||||
|
||||
@Resource
|
||||
private TokenService tokenService;
|
||||
|
||||
@@ -335,6 +342,27 @@ public class UserAPI extends BaseController {
|
||||
if (ObjectUtil.isNotNull(userPo)) {
|
||||
sysUserVo.setUserid(userPo.getUserId());
|
||||
}
|
||||
// 小程序注册用户默认分配普通用户角色(must)
|
||||
try {
|
||||
RoleDo mustRoleDo = new RoleDo();
|
||||
mustRoleDo.setRoleCode(RoleEnum.MUST.getCode());
|
||||
mustRoleDo.setOrganizationId(userPo.getOrganizationId());
|
||||
RoleEntity mustRoleEntity = roleDomainService.selectByOrganizationIdAndRoleCode(mustRoleDo);
|
||||
if (null != mustRoleEntity) {
|
||||
UserRoleDo mustUserRoleDo = new UserRoleDo();
|
||||
mustUserRoleDo.setUserId(userPo.getUserId());
|
||||
mustUserRoleDo.setRoleId(mustRoleEntity.getRoleId());
|
||||
userRoleDomainService.addUserRole(mustUserRoleDo);
|
||||
// 更新user表role_code和role_name
|
||||
UserDO updateRoleDO = new UserDO();
|
||||
updateRoleDO.setUserId(userPo.getUserId());
|
||||
updateRoleDO.setRoleCode(RoleEnum.MUST.getCode());
|
||||
updateRoleDO.setRoleName(RoleEnum.MUST.getName());
|
||||
userApplicationService.updateUser(updateRoleDO);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.warn("小程序注册分配默认角色失败: {}", e.getMessage());
|
||||
}
|
||||
sysUserVo.setUserPo(userPo);
|
||||
return R.ok(sysUserVo, "操作成功");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user