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

添加判空

Browse Source
This commit is contained in:
zhn
2023-04-07 13:49:40 +08:00
parent ad1cc761c6
commit 18a41e1d88
2 changed files with 10 additions and 5 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
+9 -4
View File
@@ -1481,9 +1481,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
map.put("click", true); map.put("click", true);
} }
if ("description".equals(dbFieldName) && StringUtils.isBlank(paramsManifestEO.getReferencesColName())) { if ("description".equals(dbFieldName)
&& ObjectUtils.isNotEmpty(paramsManifestEO)
&& StringUtils.isBlank(paramsManifestEO.getReferencesColName())) {
indexOfDescription = i; indexOfDescription = i;
} else if ("references_col".equals(dbFieldName) && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) { } else if ("references_col".equals(dbFieldName)
&& ObjectUtils.isNotEmpty(paramsManifestEO)
&& StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
indexOfDescription = i; indexOfDescription = i;
} }
@@ -1492,7 +1496,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
} }
if (CutEnum.CN.getValue().equals(cut)) { if (CutEnum.CN.getValue().equals(cut)) {
if ("references_col".equals(dbFieldName)) { if ("references_col".equals(dbFieldName)) {
if (StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) { if (ObjectUtils.isNotEmpty(paramsManifestEO) && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
map.put("type", true); // 标识 map.put("type", true); // 标识
map.put("flag", true); // 标识 map.put("flag", true); // 标识
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)); map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
@@ -1509,7 +1513,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
} }
} else { } else {
if ("references_col".equals(dbFieldName)) { if ("references_col".equals(dbFieldName)) {
if (StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) { if (ObjectUtils.isNotEmpty(paramsManifestEO)
&& StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
map.put("type", true); // 标识 map.put("type", true); // 标识
map.put("flag", true); // 标识 map.put("flag", true); // 标识
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)); map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
+1 -1
View File
@@ -314,7 +314,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) { for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
HeadCustomVO headCustomVO = new HeadCustomVO(); HeadCustomVO headCustomVO = new HeadCustomVO();
headCustomVO.setDb_field_name(paramsConfigEO.getId()); headCustomVO.setDb_field_name(paramsConfigEO.getId());
headCustomVO.setDb_field_txt(String.valueOf(count++)); headCustomVO.setDb_field_txt(paramsConfigEO.getConfigName());
headCustomVO.setIsLock(paramsConfigEO.getIsLock()); headCustomVO.setIsLock(paramsConfigEO.getIsLock());
headCustomVO.setType("true"); headCustomVO.setType("true");
headCustomVOList.add(headCustomVO); headCustomVOList.add(headCustomVO);