diff --git a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java index 5adc0930..888da3b5 100644 --- a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java +++ b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java @@ -238,7 +238,7 @@ public class ActivitiNoticeAspect { Long resourceId = null; if (kv.containsKey("resourceId") && kv.get("resourceId") != null) { resourceId = Long.valueOf(kv.get("resourceId").toString()); - } else if (kv.containsKey("id") && kv.get("id") != null && kv.containsKey("-")) { + } else if (kv.containsKey("id") && kv.get("id") != null && !kv.get("id").toString().contains("-")) { resourceId = Long.valueOf(kv.get("id").toString()); } else { resourceId = 0L; diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java index c9a88f6a..8eb9a443 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java +++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java @@ -214,8 +214,8 @@ public class AbilityCenterControllerV2 { Boolean basic_facilities = dtoList.stream().map(index -> { Optional resourceDTOOptional = Optional.ofNullable(resourceService.get(Long.valueOf(index.getResourceId()))); // 从本库内查不到 视为其它平台的基础设施资源 - return !resourceDTOOptional.isPresent() || !"基础设施".equals(resourceDTOOptional.get().getType()); - }).filter(index -> !index).findAny().orElse(Boolean.TRUE); + return !resourceDTOOptional.isPresent() || !"基础设施".equals(resourceDTOOptional.isPresent() ? "" : resourceDTOOptional.get().getType()); + }).filter(index -> !index).findAny().orElse(Boolean.FALSE); logger.error("--------------------是否全是基础设施{}----------------------------------------------", basic_facilities); final List ids = dtoList.stream().map(TAbilityApplicationDTO::getId).collect(Collectors.toList()); // 发起申请的表单id // 仿照请求接口 /act/running/startOfBusinessKey