From f3fd9a4e6dfb6269f7765baf90b7fb78feae2582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Mon, 5 Aug 2024 17:15:43 +0800
Subject: [PATCH] fix:87770

---
 .../laws/marketStandard/mapper/LawsMarketStandardMapper.java   | 2 +-
 .../marketStandard/mapper/xml/LawsMarketStandardMapper.xml     | 3 +++
 .../service/impl/LawsMarketStandardServiceImpl.java            | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java
index 9ccc51e6..33fa0548 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java
@@ -30,7 +30,7 @@ public interface LawsMarketStandardMapper extends BaseMapper<LawsMarketStandard>
      * @param str
      * @return
      */
-    String getOneByManifestNo(String str);
+    String getOneByManifestNo(@Param("str") String str,@Param("oldStr") String oldStr);
 
     /**
      *  获取英文简称
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml
index fbb6e951..d9a222ec 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml
@@ -62,6 +62,9 @@
     </select>
     <select id="getOneByManifestNo" resultType="java.lang.String">
         select max(manifest_no) as manifest_no from laws_market_standard where manifest_no like CONCAT(#{str},'%')
+        <if test = "oldStr != null and oldStr != ''">
+            and manifest_no &lt;> #{oldStr}
+        </if>
     </select>
     <select id="getOneByEnBase" resultType="java.lang.String">
         select s2.en_base from sys_dict s1
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 f1ed436a..c7cfdb6e 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
@@ -208,7 +208,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     private String generateManifestNo(String manifestNoSub,String oldManifestNoSub) {
         // 生成清单编号
         String s = "BZFG-" + manifestNoSub + "-";
-        String manifestNo = marketStandardMapper.getOneByManifestNo(s);
+        String manifestNo = marketStandardMapper.getOneByManifestNo(s,oldManifestNoSub);
         if(StringUtils.isBlank(manifestNo)){
             return s + "01";
         }