From fea23ae5c4872e72e95fa8dc9c1024165df0947c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 26 Sep 2023 17:19:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E6=9C=AA?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=88=B0=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=EF=BC=88=E4=B8=AD=E8=8B=B1=E6=96=87=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectCertificationInventoryEOServiceImpl.java   | 7 ++++++-
 .../service/impl/ProjectLibraryBaseServiceImpl.java        | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index ce0939d77..a583167ed 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -7206,7 +7206,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				}
 				String serialNumber = projectCertificationInventoryEO.getSerialNumber();
 				String dutyTerritoryName = com.jero.modules.system.util.StringUtils.join(list,",");
-				String msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				String msg = "";
+				if(CutEnum.CN.getValue().equals(cut)){
+					msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				}else{
+					msg = serialNumber+" "+dutyTerritoryName+" no data matched";
+				}
 				msgList.add(msg);
 			}
 		}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index ba55769c4..6d5f66965 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1423,7 +1423,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				}
 				String serialNumber = projectLawsInventoryEO.getSerialNumber();
 				String dutyTerritoryName = StringUtils.join(list,",");
-				String msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				String msg = "";
+				if(CutEnum.CN.getValue().equals(cut)){
+					msg = serialNumber+" "+dutyTerritoryName+"未匹配到数据";
+				}else{
+					msg = serialNumber+" "+dutyTerritoryName+" no data matched";
+				}
 				msgList.add(msg);
 			}
 		}