remove - 移除新增的方法重载
This commit is contained in:
parent
987e3f8854
commit
0b90432bc1
@ -139,12 +139,6 @@ public interface TyrSaasRoleApi {
|
||||
@GetMapping("/api/saasRole/queryByWorkspaceType")
|
||||
ApiResult<List<SaasRoleAndGroupVO>> queryInitRoleByWorkspaceId(@RequestParam("workspaceType") String workspaceType);
|
||||
|
||||
/**
|
||||
* 通过工作台类型获取对应角色
|
||||
*/
|
||||
@GetMapping("/api/saasRole/queryByWorkspaceType")
|
||||
ApiResult<List<SaasRoleAndGroupVO>> queryInitRole(@Validated @RequestBody QuerySaasRoleGroupReq query);
|
||||
|
||||
/**
|
||||
* 通过角色分组Code查询标准角色
|
||||
*/
|
||||
|
||||
@ -198,11 +198,6 @@ public class SaasRoleController implements TyrSaasRoleApi {
|
||||
return ApiResult.ok(roleService.queryInitRoleByWorkspaceId(workspaceType));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ApiResult<List<SaasRoleAndGroupVO>> queryInitRole(@Validated @RequestBody QuerySaasRoleGroupReq query) {
|
||||
return ApiResult.ok(roleService.queryInitRole(query));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ApiResult<List<SaasRoleCategoryVO>> queryByCategoryCode(List<String> categoryCodes) {
|
||||
return ApiResult.ok(roleService.queryByCategoryCode(categoryCodes));
|
||||
|
||||
@ -99,7 +99,6 @@ public interface RoleService extends IService<SaasRole> {
|
||||
|
||||
|
||||
List<SaasRoleAndGroupVO> queryInitRoleByWorkspaceId(String workspaceType);
|
||||
List<SaasRoleAndGroupVO> queryInitRole(QuerySaasRoleGroupReq req);
|
||||
|
||||
/**
|
||||
* 删除角色列表
|
||||
|
||||
@ -838,15 +838,9 @@ public class RoleServiceImpl extends ServiceImpl<SaasRoleMapper, SaasRole>
|
||||
if (StrUtil.isEmpty(workspaceType)) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
return queryInitRole(QuerySaasRoleGroupReq.builder()
|
||||
List<SaasRoleGroup> query = saasRoleGroupDao.query(QuerySaasRoleGroupReq.builder()
|
||||
.workspaceTypeCode(ListUtil.of(workspaceType))
|
||||
.build());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SaasRoleAndGroupVO> queryInitRole(QuerySaasRoleGroupReq req) {
|
||||
|
||||
List<SaasRoleGroup> query = saasRoleGroupDao.query(req);
|
||||
|
||||
if (CollectionUtils.isEmpty(query)) {
|
||||
return Collections.emptyList();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user