fix:87770

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);
 
     /**
      *  获取英文简称

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

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";
         }