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

fix(REQ-2545): 记录菜单绑定角色关系的日志

Browse Source
This commit is contained in:
李昆鹏 2024-07-24 19:41:05 +08:00
parent 615b852e6a
commit facd027ffa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleServiceImpl.java
View File

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