From 784db6f298bc186ed382ea2507dc245e086fc4c5 Mon Sep 17 00:00:00 2001
From: lilong <lilong@axzo.cn>
Date: Fri, 25 Oct 2024 11:01:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20(feature/REQ-2750)=201=E3=80=81?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=84=E4=BB=B6=E8=B5=84=E6=BA=90=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=97=B6groupCode=E8=A2=AB=E8=A6=86=E7=9B=96=E6=88=90?=
 =?UTF-8?q?code=E7=9A=84=E9=97=AE=E9=A2=98=202=E3=80=81=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B9=E7=9B=AE=E4=B8=8B=E6=9C=89=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=9A=84=E4=BA=BA=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=87=BAadmin=E8=A7=92=E8=89=B2=E7=9A=84=E4=BA=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SaasPageElementServiceImpl.java      |  5 ++
 .../service/impl/TyrSaasAuthServiceImpl.java  | 52 +++++++++----------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java
index b18a6b40..a9a68965 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java
@@ -604,6 +604,11 @@ public class SaasPageElementServiceImpl extends ServiceImpl<SaasPageElementMappe
                 // 更新关联关系的page_element_code
                 saasPageElementFeatureResourceRelationDao.updateGroupCode(dbPageElement.getCode(), basePageElement.getCode(), dbPageElement.getTerminal());
             }
+            // page的groupCode是自己的code，但是component的groupCode是父级页面的code
+            // 原来component在更新时会把自己的groupCode更新成自己的code
+            if (PageElementTypeEnum.COMPONENT.getCode().equals(req.getType())) {
+                basePageElement.setGroupCode(req.getGroupCode());
+            }
             saasPageElementDao.updateById(basePageElement);
         } else {
             if (PageElementTypeEnum.PAGE.getCode().equals(req.getType())) {
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
index 94087f05..c79a9a50 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
@@ -561,16 +561,6 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
         return result;
     }
 
-    private List<SaasRoleRes> listAdminRole(ListPermissionUser req) {
-        //超管和管理员
-        ListRoleReq listSaasRoleParam = ListRoleReq.builder()
-                .workspaceId(req.getWorkspaceId())
-                .ouId(req.getOuId())
-                .roleTypes(Lists.newArrayList(RoleTypeEnum.SUPER_ADMIN.getValue(), RoleTypeEnum.ADMIN.getValue()))
-                .build();
-        return roleService.list(listSaasRoleParam);
-    }
-
     private Set<Long> resolvePermissionAdminRole(List<SaasRoleRes> adminRoles,
                                                   List<ProductPermissionCacheService.PermissionDTO> productPermissions) {
         Set<String> cooperateTypes = productPermissions.stream()
@@ -585,21 +575,12 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
 
     private Set<Long> resolvePermissionNormalRole(ListPermissionUser req,
                                                   List<ProductPermissionCacheService.PermissionDTO> productPermissions,
-                                                  Set<Long> featureIds) {
+                                                  Set<Long> featureIds,
+                                                  List<SaasRoleRes> allRoles) {
 
-        // 因为通过权限id找对应的角色数据量巨大，所以通过找项目的角色，再找有权限的角色比较快
-        Set<Long> allRoleIds = saasRoleUserRelationMapper.listRoleIds(SaasRoleUserRelationMapper.ListRole.builder()
-                .ouId(req.getOuId())
-                .workspaceId(req.getWorkspaceId())
-                .build());
-        if (CollectionUtils.isEmpty(allRoleIds)) {
-            return Collections.emptySet();
-        }
-
-        List<SaasRoleRes> normalRoles = roleService.list(RoleService.ListSaasRoleParam.builder()
-                .roleIds(Lists.newArrayList(allRoleIds))
-                .roleTypes(RoleTypeEnum.listNormal())
-                .build());
+        List<SaasRoleRes> normalRoles = allRoles.stream()
+                .filter(e -> !RoleTypeEnum.isAdmin(e.getRoleType()))
+                .collect(Collectors.toList());
 
         if (CollectionUtils.isEmpty(normalRoles)) {
             return Collections.emptySet();
@@ -653,11 +634,30 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
                                                                            List<ProductPermissionCacheService.PermissionDTO> productPermissions,
                                                                            Set<Long> featureIds) {
 
+        // 因为通过权限id找对应的角色数据量巨大，所以通过找项目的角色，再找有权限的角色比较快
+        Set<Long> allRoleIds = saasRoleUserRelationMapper.listRoleIds(SaasRoleUserRelationMapper.ListRole.builder()
+                .ouId(req.getOuId())
+                .workspaceId(req.getWorkspaceId())
+                .build());
+        if (CollectionUtils.isEmpty(allRoleIds)) {
+            return Collections.emptyList();
+        }
+
+        List<SaasRoleRes> allRoles = roleService.list(ListRoleReq.builder()
+                .roleIds(Lists.newArrayList(allRoleIds))
+                .build());
+
+        if (CollectionUtils.isEmpty(allRoles)) {
+            return Collections.emptyList();
+        }
+
         //超管和管理员
-        List<SaasRoleRes> adminRoles = listAdminRole(req);
+        List<SaasRoleRes> adminRoles = allRoles.stream()
+                .filter(e -> RoleTypeEnum.isAdmin(e.getRoleType()))
+                .collect(Collectors.toList());
 
         Set<Long> adminPermissionRoleIds = resolvePermissionAdminRole(adminRoles, productPermissions);
-        Set<Long> normalPermissionRoleIds = resolvePermissionNormalRole(req, productPermissions, featureIds);
+        Set<Long> normalPermissionRoleIds = resolvePermissionNormalRole(req, productPermissions, featureIds, allRoles);
 
         Set<Long> roleIds = Sets.newHashSet();
         roleIds.addAll(adminPermissionRoleIds);