diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index 0632a22e..8960b1f8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -170,7 +170,9 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl listDict = map.get("market_state"); List country = listDict.stream().map(DictModel::getText).collect(Collectors.toList()); // 国家/地区+自定义+固定字段,自定义字段:预留手填,当前默认不填;固定字段:车型需满足标准法规清单 - manifest.setManifestName(String.join("",country) + manifest.getCustomColumnName() + "车型需满足标准法规清单"); + manifest.setManifestName(String.join("",country) + + (StringUtils.isEmpty(manifest.getCustomColumnName()) ? "" : manifest.getCustomColumnName()) + + "车型需满足标准法规清单"); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); manifest.setAuthor(sysUser.getId()); manifest.setUpdateTime(new Date()); @@ -239,7 +241,9 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl listDict = map.get("market_state"); List country = listDict.stream().map(DictModel::getText).collect(Collectors.toList()); // 国家/地区+自定义+固定字段,自定义字段:预留手填,当前默认不填;固定字段:车型需满足标准法规清单 - manifest.setManifestName(String.join("",country) + manifest.getCustomColumnName() + "车型需满足标准法规清单"); + manifest.setManifestName(String.join("",country) + + (StringUtils.isEmpty(manifest.getCustomColumnName()) ? "" : manifest.getCustomColumnName()) + + "车型需满足标准法规清单"); updateById(manifest); } }