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

Merge branch 'feature/REQ-2186'

Browse Source
This commit is contained in:
lilong 2024-06-05 21:58:14 +08:00
commit 0122499cd8
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java
View File

@ -1,5 +1,6 @@
package cn.axzo.tyr.server.controller.permission;
import cn.axzo.basics.common.exception.ServiceException;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.tyr.client.feign.FeatureResourceApi;
import cn.axzo.tyr.client.model.req.FeatureResourceTreeSaveReq;
@ -58,9 +59,10 @@ public class FeatureResourceController implements FeatureResourceApi {
@Override
public ApiResult<Void> deleteFeatureResource(Long featureId, Long operatorId) {
log.info("deleteFeatureResource featureId : {}, operatorId : {}", featureId, operatorId);
featureResourceService.deleteMenuFeature(featureId, operatorId);
return ApiResult.ok();
throw new ServiceException("暂时不支持删除权限点");
// log.info("deleteFeatureResource featureId : {}, operatorId : {}", featureId, operatorId);
// featureResourceService.deleteMenuFeature(featureId, operatorId);
// return ApiResult.ok();
}
@Override

33
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java
View File

@ -318,22 +318,23 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic
@Transactional(rollbackFor = Exception.class)
@CacheEvict(value = SaasFeatureResourceCacheService.CACHE_FEATURE_RESOURCE_TREE,allEntries = true)
public void deleteMenuFeature(Long featureId, Long operatorId) {
if (featureId == null) {
return;
}
List<SaasFeatureResource> featureDescendant = featureResourceDao.lambdaQuery()
.eq(BaseEntity::getIsDelete,0)
.apply("FIND_IN_SET('" + featureId + "', path)")
.list();
List<Long> featureIds = featureDescendant.stream().map(SaasFeatureResource::getId).collect(Collectors.toList());
pgroupPermissionRelationService.deleteByFeatureIds(featureIds);
// 删除自己及自己的子集
featureResourceDao.lambdaUpdate()
.eq(BaseEntity::getIsDelete,0)
.apply("FIND_IN_SET('" + featureId + "', path)")
.set(SaasFeatureResource::getUpdateBy, operatorId)
.set(BaseEntity::getIsDelete,1)
.update();
// if (featureId == null) {
// return;
// }
// List<SaasFeatureResource> featureDescendant = featureResourceDao.lambdaQuery()
// .eq(BaseEntity::getIsDelete,0)
// .apply("FIND_IN_SET('" + featureId + "', path)")
// .list();
// List<Long> featureIds = featureDescendant.stream().map(SaasFeatureResource::getId).collect(Collectors.toList());
// pgroupPermissionRelationService.deleteByFeatureIds(featureIds);
// // 删除自己及自己的子集
// featureResourceDao.lambdaUpdate()
// .eq(BaseEntity::getIsDelete,0)
// .apply("FIND_IN_SET('" + featureId + "', path)")
// .set(SaasFeatureResource::getUpdateBy, operatorId)
// .set(BaseEntity::getIsDelete,1)
// .update();
}
@Override