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

Merge remote-tracking branch 'origin/feature/REQ-2227' into feature/REQ-2227

Browse Source
This commit is contained in:
zhansihu 2024-04-17 18:13:14 +08:00
commit 89a0bee0c0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceCacheService.java
View File

@ -23,7 +23,7 @@ public class SaasFeatureResourceCacheService {
private final SaasFeatureResourceDao featureResourceDao;
@Cacheable(value = CACHE_FEATURE_RESOURCE_TREE, key = "#req.keyword + '_' + #req.terminals+ '_' + #req.featureTypes", unless = "#result.isEmpty()")
@Cacheable(value = CACHE_FEATURE_RESOURCE_TREE, key = "#req.terminals+ '_' + #req.featureTypes+ '_' + #req.status", unless = "#result.isEmpty()")
public List<SaasFeatureResource> getByResourceTreeParam (GetFeatureResourceTreeReq req) {
log.info("get feature resource tree has not user cache!");
return featureResourceDao.getByResourceTreeParam(req);

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

@ -223,7 +223,7 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic
if (featureId != null && authType != null) {
featureResourceDao.lambdaUpdate()
.eq(SaasFeatureResource::getId, featureId)
.eq(BaseEntity::getIsDelete,1)
.eq(BaseEntity::getIsDelete,0)
.set(SaasFeatureResource::getAuthType, authType)
.update();
}
@ -288,7 +288,8 @@ public class SaasFeatureResourceServiceImpl implements SaasFeatureResourceServic
.eq(BaseEntity::getIsDelete,0)
.apply("FIND_IN_SET('" + deleteChild.getId() + "', path)")
.set(SaasFeatureResource::getUpdateBy, operatorId)
.set(BaseEntity::getIsDelete,1);
.set(BaseEntity::getIsDelete,1)
.update();
}
}
}