From a5e8fe0c8faa1cf770d3711511ddbece126b70f0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 2 Feb 2024 14:14:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2-=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91=E8=B5=B7=20?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=BF=85=E5=A1=AB=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessEsAnnualInit.java           |   2 +-
 .../impl/ProcessEsAnnualInitServiceImpl.java  |   2 +-
 .../modules/activiti/util/ExcelUtils.java     |   2 +-
 .../年度制修订计划（标准化发起）导入模板.xls  | Bin 20480 -> 20480 bytes
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java
index 824ad15d..2186a7fd 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java
@@ -122,7 +122,7 @@ public class ProcessEsAnnualInit implements Serializable {
     /**
      * 新企标名称
      */
-    @Excel(name = "*新企标名称", width = 15, orderNum = "3")
+    @Excel(name = "新企标名称", width = 15, orderNum = "3")
     @ApiModelProperty(value = "新企标名称")
     private String newEnStandardName;
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index 7d2fb47f..60e262dd 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
@@ -637,6 +637,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         String projectType = plan.getProjectType();
         String originEnStandardNo = plan.getOriginEnStandardNo();
         String newEnStandardName = plan.getNewEnStandardName();
+        errMsg.append(excelUtils.validStandardName(newEnStandardName));
         if (StrUtil.isBlank(projectType)) {
             return "'制修订类型'不能为空。";
         }
@@ -645,7 +646,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         }
         // 修订
         if (projectType.equals(ESPProjectType.MODIFY.getName())) {
-            errMsg.append(excelUtils.validStandardName(newEnStandardName));
             // 检查企标编号是否有效
             if (StrUtil.isBlank(originEnStandardNo)) {
                 errMsg.append("'原企标编号'不能为空。");
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
index 19bccc8b..209f6962 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
@@ -467,7 +467,7 @@ public class ExcelUtils {
 
     public String validStandardName(String value) {
         if (StrUtil.isBlank(value)) {
-            return "'新企标名称不能为空'。";
+            return "";
         }
         if (value.length() > 50) {
             return "'新企标名称'过长（最多50字）。";
diff --git a/laws-modules/src/main/resources/excelTemplate/年度制修订计划（标准化发起）导入模板.xls b/laws-modules/src/main/resources/excelTemplate/年度制修订计划（标准化发起）导入模板.xls
index 776c5c5c4468f942be315bb73ece028c98cd5203..a850a67714244634422a5aa0bfb351c5aa17828b 100644
GIT binary patch
delta 994
zcma)4&1(}u6n`_>?B=7%Zn9~1^PvrbMe0W=J%~*(*tAJZscmT$MQANiEPjE<f;PpA
z;GspHQt;4J@Zhn!;=zLk3VQHjq3S_V5B>pOiYQ2YyPKq4ytu=>dB6G1@AqbBW?_{r
ztg^K$g8SXs59=#<UAWDj;4h)d?ih3Ky&SJey0IdimM|#m%!{&|##8bUJRFc?0RY%)
zC;*!<MyU=^Pkn<31hFP-F?pL!Q5tQrGNuDsj8wMvUMRHeU-pBLwzMH^kT(1e>$O-F
z(~1_0wAf8JM`^s}+=<hQrcxo>`57hVC-mS$MZ;A^WID=Wjm7YlGEK27WX7r$zgjUD
zHfL(#kGQCc0vYQ#rbh6F8fFqMsaM5eIRExi#o&=*uy=^O83gEuxm5=m_5g6xvyXZU
znPZVU!``k=qq66{&J+FEpBZEav6@My;^g9{#%dF6RGN)ee@+lsyI_LA<c~RglX=eK
zIG@!iE@yX_Z2>2V2wo07AkDrWe_Z*r^x}kh8n&B7jNJ81o}3sNZA}aI`pJdQ^VV9U
zk*#y~9qYM1-gng4$~|Ii2p=4q*<S)LZTS!QDEgpejW+TV^0&DTIF8)|Gu0BP%{fM6
zfer=WB^;p5Fhc*+RI8eKlm+N)dT~-0&8O4kI3cZ#T(puNoyk?{4g`X+Ht8lr7uXbv
zBuuoC<S5~BATN|5*<R^$Aio23?C?Cp=^^Ya5hT;?oyrcRI8exe!VVV|3iu_TV1U2#
z-9Zstv@u4vPMOO%G<b_WEkwCA#iu$37Ke>pr7Xws@<ptdH-uz<eZ{yxd|CJln9jI_

delta 945
zcma))O=uHQ5Xa{|ceD9uvYTv@O>8tp(1TV}^iV=msgjQxX;Vq8dI~`-0ljz;a%n;l
z^dK!Ve&DGU1Qk3KSE_ihIfw@ZKcLb>JqR8I58_3NP^q)K$+mlQ7v{a+{Ad329=ojt
z)>>eTmjtnIes-gQmxXJrhJS=6o6#HMUal`mXC)?~ENd8$V|Y}KF%PEv8cxb-d??Ft
zKLGsRQ~*|Bg0@kBcHdVBLjXU>8VeY;OvX)Fi&KqNc`F!PPA(@w@R*fBOetDCWUEtC
zmO5yvDppAichwcB0Sv^tQzAI0Xetf0oS)Igc!Yy^U(xWR;$kseRjL#RgGRh-#&t8E
z2^pE^p;i2;y6}k_!dY5ht94fquHI{<^uysoK+KaJ!&)+;FYoyr<L}aVXDG|kxHgpN
zj{^gdUN&E5C8-{5u9scl;jkYTFBl1b<yQm1szNQZ#Nzlq6QlS&v%6@eIkk6sr23mv
zkIt{ny&UiMh?d#dO?TyVd92h;3s$<)`Z8_S>ZRc}XV*~~Il{jU>$#B!jAil1vD$$G
zc<A_l!AsE#1#`8?N941$9vH<d$7{_3sGS_6HAkNj;1%@KH5t+Wys9~ko86I)7pLyL
z@n>{2PNdnigM8_G8d?)L2!wH46p41)<f6u2n<Ub<Mz|g1ffJChE4>c#IjCow=Q$4k
zZO9=&rdubK9i%uY=%A3pMTHz5%Jwoh7PI>T0?nXbiY`h!zdoIvVc5=2Jk3YBG|3;o
fxZx}6yGAn{YsD%K2ySc_KM8LW8x8&T$&122N7T6X