diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/system/ListDeployAppConfigAuthorityApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/system/ListDeployAppConfigAuthorityApi.java index e1227686c39f26c84600577e06c7a883ab5f01ab..d6459fbed451e8e80a3cf4f360110a0244ccd3b2 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/system/ListDeployAppConfigAuthorityApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/system/ListDeployAppConfigAuthorityApi.java @@ -32,6 +32,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper; import neatlogic.module.deploy.util.DeployPipelineConfigManager; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -90,11 +91,14 @@ public class ListDeployAppConfigAuthorityApi extends PrivateApiComponentBase { throw new DeployAppConfigNotFoundException(appSystemId); } List scenarioAuthList = new ArrayList<>(); - for (AutoexecCombopScenarioVo scenarioVo : pipelineConfigVo.getScenarioList()) { - JSONObject scenarioValueText = new JSONObject(); - scenarioValueText.put("text", scenarioVo.getScenarioName()); - scenarioValueText.put("value", scenarioVo.getScenarioId()); - scenarioAuthList.add(scenarioValueText); + List scenarioList = pipelineConfigVo.getScenarioList(); + if (CollectionUtils.isNotEmpty(scenarioList)) { + for (AutoexecCombopScenarioVo scenarioVo : scenarioList) { + JSONObject scenarioValueText = new JSONObject(); + scenarioValueText.put("text", scenarioVo.getScenarioName()); + scenarioValueText.put("value", scenarioVo.getScenarioId()); + scenarioAuthList.add(scenarioValueText); + } } returnObj.put("scenarioAuthList", scenarioAuthList); diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml index 0c5f3e9d1573addb1dd83970762c0e8096b8de7a..b6265b48e3902a5a0762382dc938924df262e979 100644 --- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml +++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml @@ -596,8 +596,9 @@ limitations under the License.