WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_20230811' into 'master'

Browse Source 
修改参数传int值报错问题

See merge request laws-nio/laws-weilai!360
This commit is contained in:
高嵩
2023-08-22 10:37:38 +00:00
parent d557b67f54 91a21420a8
commit 24f5a10abb
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+10 -3
View File
@@ -1645,7 +1645,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
boolean appendFlag = false; // 拼接标识
for (Map<String, Object> 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<ParamsCollec
}
for (Map<String, Object> 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)) {
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+1 -1
View File
@@ -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
}