wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-08-25 13:31:51 +08:00
parent 26f551c61e a87bb573e9
commit a080184d70
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -1867,6 +1867,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
if (abilityApplicationDTO != null && org.apache.commons.lang3.StringUtils.isNotEmpty(abilityApplicationDTO.getSystem()) && org.apache.commons.lang3.StringUtils.isEmpty(his.getName())) {
resourceIds.add(Long.parseLong(abilityApplicationDTO.getResourceId()));
} else {
// TODO 有问题
if (his.getBusinessKey().startsWith("[") && his.getBusinessKey().endsWith("]")) {
continue;
}
TAbilityApplicationDTO abilityApplicationDTO1 = tAbilityApplicationService.getByBusinessKey(his.getBusinessKey());
if (abilityApplicationDTO1 != null) {
resourceIds.add(Long.parseLong(abilityApplicationDTO1.getResourceId()));