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

feat:(REQ-3068) 解决新菜单跟菜单端重复的问题

Browse Source
This commit is contained in:
lilong 2024-10-11 18:42:17 +08:00
parent 0e9e269f4b
commit 9ae581f5fb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -858,7 +858,11 @@ public class SaasFeatureResourceServiceImpl extends ServiceImpl<SaasFeatureResou
}
return resolveSaasFeature(Sets.newHashSet(terminals)).stream()
.collect(Collectors.toMap(SaasFeatureResourceDTO::getTerminal, SaasFeatureResourceDTO::getFeatures));
.collect(Collectors.toMap(SaasFeatureResourceDTO::getTerminal, SaasFeatureResourceDTO::getFeatures,
(f, s) -> {
f.addAll(s);
return f;
}));
}
private List<SaasFeatureResourceDTO> resolveSaasFeature(Set<String> terminals) {

1
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
View File

@ -814,6 +814,7 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
try {
return findIdentityAuthV2(req).getPermissions();
} catch (Exception ex) {
log.error("", ex);
log.error("查询权限异常，执行降级处理");
return findIdentityAuth(req).getPermissions();
}