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

feat:(REQ-2298) 修改预设角色的添加和移位按照租户id和单位id隔离

Browse Source
This commit is contained in:
lilong 2024-05-29 09:42:51 +08:00
parent bf27b94651
commit 1493848a06
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java
View File

@ -74,6 +74,8 @@ public class SaasRoleGroupController implements SaasRoleGroupApi {
List<SaasRoleGroup> roleGroupList = saasRoleGroupService.lambdaQuery()
.eq(SaasRoleGroup::getParentId, saasRoleGroup.getParentId())
.eq(SaasRoleGroup::getWorkspaceTypeCode, saasRoleGroup.getWorkspaceTypeCode())
.eq(SaasRoleGroup::getWorkspaceId, saasRoleGroup.getWorkspaceId())
.eq(SaasRoleGroup::getOuId, saasRoleGroup.getOuId())
.list()
.stream()
.sorted(Comparator.comparing(SaasRoleGroup::getSort))

3
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java
View File

@ -200,7 +200,8 @@ public class SaasRoleGroupServiceImpl extends ServiceImpl<SaasRoleGroupMapper, S
.eq(SaasRoleGroup::getParentId, saasRoleGroup.getParentId())
.eq(SaasRoleGroup::getWorkspaceTypeCode, saasRoleGroup.getWorkspaceTypeCode())
.eq(SaasRoleGroup::getIsDelete, TableIsDeleteEnum.NORMAL.value)
.eq(SaasRoleGroup::getWorkspaceTypeCode, saasRoleGroup.getWorkspaceTypeCode())
.eq(SaasRoleGroup::getWorkspaceId, saasRoleGroup.getWorkspaceId())
.eq(SaasRoleGroup::getOuId, saasRoleGroup.getOuId())
.orderByDesc(SaasRoleGroup::getSort)
.last("limit 1")
.list()