wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: REQ-1650

Browse Source
This commit is contained in:
zuoqinbo 2023-12-01 11:23:55 +08:00
parent 96ff41ef79
commit 495e026157
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java
View File

@ -18,7 +18,7 @@ import java.util.List;
public interface SaasRoleGroupApi {
/**
* 保存/更新
* 保存/更新角色分组
* @return
*/
@PostMapping("/api/saasRoleGroup/save")

18
tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java
View File

@ -28,8 +28,8 @@ import java.util.List;
/**
* 权限
*
* @version V1.0
* @author ZhanSiHu
* @version V1.0
* @date 2023/9/6 14:55
*/
@Slf4j
@ -48,9 +48,9 @@ public class SaasRoleController implements TyrSaasRoleApi {
@Override
public ApiResult<SaasRoleVO> getById(Long id) {
QuerySaasRoleReq query = QuerySaasRoleReq.builder()
.ids(Lists.newArrayList(id))
.includePermissionGroup(true)
.build();
.ids(Lists.newArrayList(id))
.includePermissionGroup(true)
.build();
List<SaasRoleVO> saasRoles = roleService.query(query);
if (CollectionUtils.isNotEmpty(saasRoles)) {
return ApiResult.ok(saasRoles.get(0));
@ -64,8 +64,8 @@ public class SaasRoleController implements TyrSaasRoleApi {
}
@Override
public ApiResult<Void> deleteRole(List<Long> roleIds,Long workSpaceId,Long outId) {
roleService.deleteRole(roleIds,workSpaceId,outId);
public ApiResult<Void> deleteRole(List<Long> roleIds, Long workSpaceId, Long outId) {
roleService.deleteRole(roleIds, workSpaceId, outId);
return ApiResult.ok();
}
@ -75,8 +75,8 @@ public class SaasRoleController implements TyrSaasRoleApi {
}
@Override
public ApiResult<List<SaasRoleVO>> queryByIdentityIdType(Long identityId, Integer identityType,Long workspaceId,Long ouId,Boolean includePermissionGroup) {
return ApiResult.ok(roleService.queryByIdentityIdType(identityId, identityType,workspaceId,ouId, includePermissionGroup));
public ApiResult<List<SaasRoleVO>> queryByIdentityIdType(Long identityId, Integer identityType, Long workspaceId, Long ouId, Boolean includePermissionGroup) {
return ApiResult.ok(roleService.queryByIdentityIdType(identityId, identityType, workspaceId, ouId, includePermissionGroup));
}
@Override
@ -100,7 +100,7 @@ public class SaasRoleController implements TyrSaasRoleApi {
}
@Override
public ApiResult<List<SaasRoleAndGroupVO>> queryInitRoleByWorkspaceId(String workspaceType) {
public ApiResult<List<SaasRoleAndGroupVO>> queryInitRoleByWorkspaceId(String workspaceType) {
return ApiResult.ok(roleService.queryInitRoleByWorkspaceId(workspaceType));
}