feat:(REQ-2186) 角色分组权限编码改成租户下唯一

2024-05-20 11:38:01 +08:00 · 2024-05-20 11:38:01 +08:00 · bd7c22d33c
commit bd7c22d33c
parent 6273381010
1 changed files with 2 additions and 0 deletions
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleGroupServiceImpl.java
@ -208,6 +208,8 @@ public class SaasRoleGroupServiceImpl extends ServiceImpl<SaasRoleGroupMapper, S
            Integer count = saasRoleGroupDao.lambdaQuery()
                    .eq(SaasRoleGroup::getCode, req.getCode())
                    .eq(SaasRoleGroup::getIsDelete, TableIsDeleteEnum.NORMAL.value)
+                    .eq(Objects.nonNull(req.getWorkspaceId()), SaasRoleGroup::getWorkspaceId,req.getWorkspaceId())
+                    .eq(Objects.nonNull(req.getOuId()), SaasRoleGroup::getOuId,req.getOuId())
                    .count();
            if (count > 0) {
                throw new ServiceException("角色分组编码已经存在");