From facd027ffa092e6e2e62205c495302898ac9077d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=98=86=E9=B9=8F?= <likunpeng@axzo.cn>
Date: Wed, 24 Jul 2024 19:41:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(REQ-2545):=20=E8=AE=B0=E5=BD=95=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E7=BB=91=E5=AE=9A=E8=A7=92=E8=89=B2=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../axzo/tyr/server/service/impl/RoleServiceImpl.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
index 09be600c..0e2750aa 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
@@ -361,7 +361,7 @@ public class RoleServiceImpl extends ServiceImpl<SaasRoleMapper, SaasRole>
         saveSaasFeaturePermission(saveOrUpdateRole, saasFeatures, saasPermissionGroup);
 
         // 保存新的菜单资源树权限
-        saveSaasFeatureResourcePermission(saveOrUpdateRole, saasFeatureResources, saasPermissionGroup);
+        saveSaasFeatureResourcePermission(saveOrUpdateRole, saasFeatureResources, saasPermissionGroup, saasRole);
 
         return saasRole.getId();
     }
@@ -409,7 +409,7 @@ public class RoleServiceImpl extends ServiceImpl<SaasRoleMapper, SaasRole>
      */
     private void saveSaasFeatureResourcePermission(SaveOrUpdateRoleVO saveOrUpdateRole,
                                            List<ResourcePermission> resourcePermissions,
-                                           SaasPermissionGroup saasPermissionGroup) {
+                                           SaasPermissionGroup saasPermissionGroup, SaasRole saasRole) {
         if (CollectionUtils.isEmpty(saveOrUpdateRole.getPermissionIds())) {
             return;
         }
@@ -440,7 +440,7 @@ public class RoleServiceImpl extends ServiceImpl<SaasRoleMapper, SaasRole>
                 .build();
         saasPgroupPermissionRelationService.saveOrUpdate(upsertPermissionRelationParam);
 
-        saveOperateLog4RoleBindFeatureResource(saveOrUpdateRole);
+        saveOperateLog4RoleBindFeatureResource(saveOrUpdateRole, saasRole);
     }
 
     @Override
@@ -1545,7 +1545,7 @@ public class RoleServiceImpl extends ServiceImpl<SaasRoleMapper, SaasRole>
         saasPgroupPermissionRelationOperateLogService.batchSave(Lists.newArrayList(operateLog));
     }
 
-    private void saveOperateLog4RoleBindFeatureResource(SaveOrUpdateRoleVO saveOrUpdateRole) {
+    private void saveOperateLog4RoleBindFeatureResource(SaveOrUpdateRoleVO saveOrUpdateRole, SaasRole saasRole) {
         List<String> uniCodes = null;
         if (CollectionUtils.isNotEmpty(saveOrUpdateRole.getPermissionIds())) {
             uniCodes =  saasFeatureResourceDao.lambdaQuery().in(BaseEntity::getId, saveOrUpdateRole.getPermissionIds()).list().stream().map(SaasFeatureResource::getUniCode).collect(Collectors.toList());
@@ -1553,7 +1553,7 @@ public class RoleServiceImpl extends ServiceImpl<SaasRoleMapper, SaasRole>
 
         SaasPgroupPermissionRelationOperateLogOperateDO operateAfter = SaasPgroupPermissionRelationOperateLogOperateDO.builder()
                 .featureCodes(uniCodes)
-                .roleCodes(Lists.newArrayList(saveOrUpdateRole.getRoleCode()))
+                .roleCodes(Lists.newArrayList(saasRole.getRoleCode()))
                 .build();
         SaasPgroupPermissionRelationOperateLog operateLog = SaasPgroupPermissionRelationOperateLog.builder()
                 .scene(PermissionRelationOperateLogSceneEnum.OMS_ROLE_BIND_FEATURE_RESOURCE.getValue())