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-07-22 16:47:50 +08:00
parent 555c023476 676a1d2e17
commit 0d6347c964
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java
View File

@ -213,9 +213,15 @@ public class AbilityCenterControllerV2 {
}, executor); }, executor);
Boolean basic_facilities = dtoList.stream().map(index -> { Boolean basic_facilities = dtoList.stream().map(index -> {
Optional<ResourceDTO> resourceDTOOptional = Optional.ofNullable(resourceService.get(Long.valueOf(index.getResourceId()))); // 从本库内查不到 视为其它平台的基础设施资源 Optional<ResourceDTO> resourceDTOOptional = Optional.ofNullable(resourceService.get(Long.valueOf(index.getResourceId())));
return !resourceDTOOptional.isPresent() || !"基础设施".equals(resourceDTOOptional.isPresent() ? "" : resourceDTOOptional.get().getType()); if (!resourceDTOOptional.isPresent()) { // 从本库内查不到 视为其它平台的基础设施资源
}).filter(index -> !index).findAny().orElse(Boolean.FALSE); return true;
}
if ("基础设施".equals(resourceDTOOptional.get().getType())) { // 基础设施
return true;
}
return false;
}).filter(index -> index).findAny().orElse(Boolean.FALSE);
logger.error("--------------------是否全是基础设施{}----------------------------------------------", basic_facilities); logger.error("--------------------是否全是基础设施{}----------------------------------------------", basic_facilities);
final List<Long> ids = dtoList.stream().map(TAbilityApplicationDTO::getId).collect(Collectors.toList()); // 发起申请的表单id final List<Long> ids = dtoList.stream().map(TAbilityApplicationDTO::getId).collect(Collectors.toList()); // 发起申请的表单id
// 仿照请求接口 /act/running/startOfBusinessKey // 仿照请求接口 /act/running/startOfBusinessKey

3
renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java
View File

@ -120,7 +120,7 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac
/** /**
* 结束审批 * 结束审批
* *
* @param kv * @param delegateExecution
*/ */
private void endTake(DelegateExecution delegateExecution) { // 进入最后结束节点 private void endTake(DelegateExecution delegateExecution) { // 进入最后结束节点
Map<String, Object> kv = delegateExecution.getVariables(); Map<String, Object> kv = delegateExecution.getVariables();
@ -151,7 +151,6 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac
} catch (Exception exception) { } catch (Exception exception) {
logger.error("上架网关失败", exception); logger.error("上架网关失败", exception);
} }
} }
} }