From c35f614715579846204011b95d8b0815d315955d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 30 Jul 2024 11:32:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=82=E5=9C=BA=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsMarketStandardServiceImpl.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 7a4ad04c..31b9c5a7 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
@@ -180,7 +180,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         LawsMarketStandard manifest = marketStandardDetailVO.getManifest();
         manifest.setManifestStatus(MarketStandardConstants.MANIFEST_STATUS_NOT_PUBLISH);
         // 设置清单编号
-        manifest.setManifestNo(this.generateManifestNo(manifest.getCountry()));
+        manifest.setManifestNo(this.generateManifestNo(manifest.getManifestNo()));
         Map<String, List<DictModel>> map = sysBaseAPI.translateManyDict("market_state",manifest.getCountry());
         List<DictModel> listDict = map.get("market_state");
         List<String> country = listDict.stream().map(DictModel::getText).collect(Collectors.toList());
@@ -205,9 +205,9 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
      * @param country
      * @return
      */
-    private String generateManifestNo(String country) {
+    private String generateManifestNo(String manifestNoSub) {
         // 生成清单编号
-        String s = "BZFG-" + country + "-";
+        String s = "BZFG-" + manifestNoSub + "-";
         String manifestNo = marketStandardMapper.getOneByManifestNo(s);
         if(StringUtils.isBlank(manifestNo)){
             return s + "01";
@@ -250,7 +250,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
             List<String> listCountry = Arrays.stream(manifest.getCountry().split(",")).sorted().collect(Collectors.toList());
             List<String> listOldCountry = Arrays.stream(lawsMarketStandardOld.getCountry().split(",")).sorted().collect(Collectors.toList());;
             if(!Objects.equals(listCountry,listOldCountry)){
-                manifest.setManifestNo(generateManifestNo(manifest.getCountry()));
+                manifest.setManifestNo(generateManifestNo(manifest.getManifestNo()));
             }
             Map<String, List<DictModel>> map = sysBaseAPI.translateManyDict("market_state",manifest.getCountry());
             List<DictModel> listDict = map.get("market_state");