|
@@ -34,7 +34,6 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.context.annotation.Lazy;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
@@ -175,7 +174,7 @@ public class TenantServiceImpl implements TenantService {
|
|
|
public void updateTenantRoleMenu(Long tenantId, Set<Long> menuIds) {
|
|
|
TenantUtils.execute(tenantId, () -> {
|
|
|
// 获得所有角色
|
|
|
- List<RoleDO> roles = roleService.getRoleListByStatus(null);
|
|
|
+ List<RoleDO> roles = roleService.getRoleList();
|
|
|
roles.forEach(role -> Assert.isTrue(tenantId.equals(role.getTenantId()), "角色({}/{}) 租户不匹配",
|
|
|
role.getId(), role.getTenantId(), tenantId)); // 兜底校验
|
|
|
// 重新分配每个角色的权限
|