diff --git a/src/main/java/neatlogic/module/deploy/api/apppipeline/GetDeployAppPipelineApi.java b/src/main/java/neatlogic/module/deploy/api/apppipeline/GetDeployAppPipelineApi.java index a28bf64dde06dda33c8731e465385b9fa77c7c5e..9339bf80aecaf2556bfe4b8c59e64c5d0901f6cb 100644 --- a/src/main/java/neatlogic/module/deploy/api/apppipeline/GetDeployAppPipelineApi.java +++ b/src/main/java/neatlogic/module/deploy/api/apppipeline/GetDeployAppPipelineApi.java @@ -66,6 +66,7 @@ public class GetDeployAppPipelineApi extends PrivateApiComponentBase { @Override public Object myDoService(JSONObject paramObj) throws Exception { DeployAppConfigVo searchVo = paramObj.toJavaObject(DeployAppConfigVo.class); + searchVo.setId(-1L); IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); ResourceVo appSystem = resourceCrossoverMapper.getAppSystemById(searchVo.getAppSystemId()); if (appSystem == null) { diff --git a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java index 03836a84d0024fde053313f7afbee0317002dc64..ec9d8b61406fd0344d5dd17d5bbdfc72eb0742a1 100644 --- a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java +++ b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java @@ -580,18 +580,38 @@ public class DeployPipelineConfigManager { if (phaseConfigVo == null) { continue; } - List combopPhaseOperationList = phaseConfigVo.getPhaseOperationList(); - if (CollectionUtils.isEmpty(combopPhaseOperationList)) { - continue; - } + profileIdSet.addAll(getProfileIdSet(phaseConfigVo.getPhaseOperationList())); +// List combopPhaseOperationList = phaseConfigVo.getPhaseOperationList(); +// if (CollectionUtils.isEmpty(combopPhaseOperationList)) { +// continue; +// } +// for (AutoexecCombopPhaseOperationVo combopPhaseOperationVo : combopPhaseOperationList) { +// AutoexecCombopPhaseOperationConfigVo operationConfigVo = combopPhaseOperationVo.getConfig(); +// if (operationConfigVo == null) { +// continue; +// } +// Long profileId = operationConfigVo.getProfileId(); +// if (profileId != null) { +// profileIdSet.add(profileId); +// } +// } + } + return profileIdSet; + } + + private static Set getProfileIdSet(List combopPhaseOperationList) { + Set profileIdSet = new HashSet<>(); + if (CollectionUtils.isNotEmpty(combopPhaseOperationList)) { for (AutoexecCombopPhaseOperationVo combopPhaseOperationVo : combopPhaseOperationList) { AutoexecCombopPhaseOperationConfigVo operationConfigVo = combopPhaseOperationVo.getConfig(); - if (operationConfigVo == null) { - continue; - } - Long profileId = operationConfigVo.getProfileId(); - if (profileId != null) { - profileIdSet.add(profileId); + if (operationConfigVo != null) { + Long profileId = operationConfigVo.getProfileId(); + if (profileId != null) { + profileIdSet.add(profileId); + } + profileIdSet.addAll(getProfileIdSet(operationConfigVo.getIfList())); + profileIdSet.addAll(getProfileIdSet(operationConfigVo.getElseList())); + profileIdSet.addAll(getProfileIdSet(operationConfigVo.getOperations())); } } }