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

This commit is contained in:
李昆鹏 2024-07-24 20:04:42 +08:00
parent 879e8af976
commit cb46c5eb6d

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, saasRole); saveSaasFeatureResourcePermission(saveOrUpdateRole, saasFeatureResources, saasPermissionGroup);
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, SaasRole saasRole) { SaasPermissionGroup saasPermissionGroup) {
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, saasRole); saveOperateLog4RoleBindFeatureResource(saveOrUpdateRole);
} }
@Override @Override
@ -1545,7 +1545,8 @@ public class RoleServiceImpl extends ServiceImpl<SaasRoleMapper, SaasRole>
saasPgroupPermissionRelationOperateLogService.batchSave(Lists.newArrayList(operateLog)); saasPgroupPermissionRelationOperateLogService.batchSave(Lists.newArrayList(operateLog));
} }
private void saveOperateLog4RoleBindFeatureResource(SaveOrUpdateRoleVO saveOrUpdateRole, SaasRole saasRole) { private void saveOperateLog4RoleBindFeatureResource(SaveOrUpdateRoleVO saveOrUpdateRole) {
SaasRole saasRole = saasRoleDao.getById(saveOrUpdateRole.getId());
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());