diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 678c8d8ed..dc7be6228 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1645,7 +1645,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataVO : paramsConfigDataVOList) { - String dataValue = (String) paramsConfigDataVO.get("dataValue"); + Object dataValueObj = paramsConfigDataVO.get("dataValue"); + String dataValue = ""; + if(ObjectUtils.isNotEmpty(dataValueObj)){ + dataValue = String.valueOf(dataValueObj); + } // 只要其中有一个值就可以进行拼接 if (StringUtils.isNotEmpty(dataValue)) { appendFlag = true; @@ -1658,8 +1662,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigDataVO : paramsConfigDataVOList) { String type = (String) paramsConfigDataVO.get("type"); - String dataValue = (String) paramsConfigDataVO.get("dataValue"); - + Object dataValueObj = paramsConfigDataVO.get("dataValue"); + String dataValue = ""; + if(ObjectUtils.isNotEmpty(dataValueObj)){ + dataValue = String.valueOf(dataValueObj); + } if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) { paramsConfigDataEO.setTextData(dataValue); if (StringUtils.isNotEmpty(dataValue)) { diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index fdac5a6b0..22a43511a 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -2283,7 +2283,7 @@ if (keyNameOne[l].type == 'pull_more') { keyNameOne[l].dataValue = keyNameOne[l].dataValue.join(',') } - if (!keyNameOne[l].dataValue && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') { + if ((keyNameOne[l].dataValue== undefined || keyNameOne[l].dataValue == null) && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') { this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty')) return }