From 25b7273c1a1ce43c63537baefbb2c8a27f889374 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Sep 2023 13:59:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B9=B3=E5=8F=B0=E4=BB=B6-?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E8=8B=B1=E6=96=87=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...latformProjectLawsInventoryEOServiceImpl.java |  6 +++++-
 .../impl/ProjectLibraryBaseServiceImpl.java      | 16 ++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index ad4ee47d0..4fa0795d0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -11619,8 +11619,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 				dutyTerritoryStr = dutyTerritorys.stream().map(SysDictItem::getItemValue).distinct().collect(Collectors.joining(","));
 			}
 		}
-
+		String serialNumber = projectLawsInventoryEO.getSerialNumber();
+		projectLawsInventoryEO.setSerialNumber(null);
 		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, req.getParameterMap());
+		if(StringUtils.isNotBlank(serialNumber)){
+			queryWrapper.lambda().like(ProjectLawsInventoryEO::getSerialNumber,serialNumber);
+		}
 		queryWrapper.orderByDesc("create_time","serial_number");
 
 		if (StringUtils.isNotEmpty(dutyTerritoryStr)) {
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 977b15d06..a1737190b 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
@@ -1367,10 +1367,16 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			if(ObjectUtils.isEmpty(projectLawsInventoryEOS)){
 				emptyList.add(projectLawsInventoryEO);
 			}
+			String msg = "";
+			if(CutEnum.CN.getValue().equals(cut)){
+				msg = "在平台件项目中包含多条匹配内容，请选择关联";
+			}else{
+				msg = " multiple matching contents are included in the platform component project, please select association";
+			}
 
 			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
 				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
-				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容，请选择关联");
+				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
 				map.put("result",projectLawsInventoryEOS);
 				mapList.add(map);
 			}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){
@@ -1526,10 +1532,16 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				emptyList.add(projectLawsInventoryEO);
 			}
 
+			String msg = "";
+			if(CutEnum.CN.getValue().equals(cut)){
+				msg = "在平台件项目中包含多条匹配内容，请选择关联";
+			}else{
+				msg = " multiple matching contents are included in the platform component project, please select association";
+			}
 
 			if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() > 1){
 				map.put("lawsInventoryId",projectLawsInventoryEO.getId());
-				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+"在平台件项目中包含多条匹配内容，请选择关联");
+				map.put("title",serialNumber+" "+dutyTerritoryNew+" "+subtitle+msg);
 				map.put("result",projectLawsInventoryEOS);
 				mapList.add(map);
 			}else if(!projectLawsInventoryEOS.isEmpty() && projectLawsInventoryEOS.size() == 1){