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

Merge branch 'hotfix/20250218' into 'master'

Browse Source 
feat:(hotfix/20250218) 解决角色分组无法移动的问题

See merge request universal/infrastructure/backend/tyr!431
This commit is contained in:
李龙 2025-02-18 08:53:57 +00:00
commit f392b41d8b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ import cn.axzo.tyr.client.model.vo.SaasRoleGroupVO;
import cn.axzo.tyr.server.repository.entity.SaasRoleGroup; import cn.axzo.tyr.server.repository.entity.SaasRoleGroup;
import cn.axzo.tyr.server.service.SaasRoleGroupService; import cn.axzo.tyr.server.service.SaasRoleGroupService;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
@ -101,6 +102,7 @@ public class SaasRoleGroupController implements SaasRoleGroupApi {
.sort(exchangeRoleGroup.getSort()) .sort(exchangeRoleGroup.getSort())
.workspaceId(saasRoleGroup.getWorkspaceId()) .workspaceId(saasRoleGroup.getWorkspaceId())
.ouId(saasRoleGroup.getOuId()) .ouId(saasRoleGroup.getOuId())
.ouTypeCode(Lists.newArrayList(saasRoleGroup.getOuTypeCode()))
.build()); .build());
saasRoleGroupService.saveOrUpdate(SaasRoleGroupVO.builder() saasRoleGroupService.saveOrUpdate(SaasRoleGroupVO.builder()
@ -108,6 +110,7 @@ public class SaasRoleGroupController implements SaasRoleGroupApi {
.sort(saasRoleGroup.getSort()) .sort(saasRoleGroup.getSort())
.workspaceId(exchangeRoleGroup.getWorkspaceId()) .workspaceId(exchangeRoleGroup.getWorkspaceId())
.ouId(exchangeRoleGroup.getOuId()) .ouId(exchangeRoleGroup.getOuId())
.ouTypeCode(Lists.newArrayList(exchangeRoleGroup.getOuTypeCode()))
.build()); .build());
return ApiResult.ok(); return ApiResult.ok();
} }