From 9f3782391f5038baa4af5718b0104a10b0e1290d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Wed, 24 Jul 2024 10:01:57 +0800
Subject: [PATCH] fix:87326

---
 .../service/impl/LawsMarketStandardDetailServiceImpl.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
index 155d242b..e0426cbb 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
@@ -244,11 +244,9 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
                     s.append("标准编号不存在,");
                     continue;
                 }else{
-                    checkStandar(listStandardIds, listStandardIdRepeat, p, s, op);
+                    checkStandard(listStandardIds, listStandardIdRepeat, p, s, op);
                 }
             }
-            checkDate(p, s);
-
             if(!StringUtils.isBlank(s.toString())){
                 m.append("第").append(i + 4).append("行，").append(s.toString(), 0, s.toString().length() - 1)
                         .append("<br>");
@@ -257,7 +255,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         return m;
     }
 
-    private void checkStandar(List<String> listStandardIds, List<String> listStandardIdRepeat, LawsMarketStandardDetail p, StringBuilder s, Optional<LawsMarketStandardDetail> op) {
+    private void checkStandard(List<String> listStandardIds, List<String> listStandardIdRepeat, LawsMarketStandardDetail p, StringBuilder s, Optional<LawsMarketStandardDetail> op) {
         if(!op.isPresent()){
             return;
         }
@@ -277,6 +275,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
             if(!Objects.equals(obj.getStandardEnglishName(), p.getStandardEnglishName())){
                 s.append("标准英文名称错误,");
             }
+            checkDate(p, s);
             // 验证类型
             if(!Objects.equals(obj.getType(),p.getType())){
                 s.append("类型错误,");