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 175b6991..dba9b054 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 @@ -220,7 +220,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl listDict = map.get(marketState); List country = listDict.stream().map(DictModel::getText).collect(Collectors.toList()); // 国家/地区+自定义+固定字段,自定义字段:预留手填,当前默认不填;固定字段:车型需满足标准法规清单 - manifest.setManifestName(String.join("",country) + + manifest.setManifestName(String.join("、",country) + (StringUtils.isEmpty(manifest.getCustomColumnName()) ? "" : manifest.getCustomColumnName()) + "车型需满足标准法规清单"); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -288,7 +288,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl listDict = map.get(marketState); List country = listDict.stream().map(DictModel::getText).collect(Collectors.toList()); // 国家/地区+自定义+固定字段,自定义字段:预留手填,当前默认不填;固定字段:车型需满足标准法规清单 - manifest.setManifestName(String.join("",country) + + manifest.setManifestName(String.join("、",country) + (StringUtils.isEmpty(manifest.getCustomColumnName()) ? "" : manifest.getCustomColumnName()) + "车型需满足标准法规清单"); updateById(manifest);