From 216d876f4ac235f30875dd2600e76f1ff92c23e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 19 Sep 2024 15:12:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E6=B8=85=E5=8D=95=E5=90=8D=E7=A7=B0=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E4=B9=8B=E9=97=B4=E6=B7=BB=E5=8A=A0=E9=A1=BF=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMarketStandardServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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);