From f5e5d88fc2941f2d512756cf631751f0df287c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 26 Sep 2024 20:08:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E9=94=AE=E9=9B=B6?=
 =?UTF-8?q?=E9=83=A8=E4=BB=B6=E7=BB=91=E5=AE=9A=E5=85=B3=E7=B3=BB=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/laws/part/entity/LawsPartRelevance.java    | 2 +-
 .../part/service/impl/LawsPartPmmPartitionInfoServiceImpl.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartRelevance.java b/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartRelevance.java
index 8ed6771d..b3aca19e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartRelevance.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartRelevance.java
@@ -61,6 +61,7 @@ public class LawsPartRelevance implements Serializable {
      */
     @ApiModelProperty(value = "关键零部件名称")
     @Excel(name = "关键零部件名称", width = 15)
+    @NotBlank(message = "关键零部件名称不能为空")
     private String regPartNameCn;
     /**
      * 关键零部件名称（英文）
@@ -137,6 +138,5 @@ public class LawsPartRelevance implements Serializable {
      * FND+GPC关联
      */
     @ApiModelProperty(value = "FND+GPC关联")
-    @NotBlank(message = "关键零部件名称不能为空")
     private String fndGpc;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartPmmPartitionInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartPmmPartitionInfoServiceImpl.java
index 6b2a813d..c68b1eb1 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartPmmPartitionInfoServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartPmmPartitionInfoServiceImpl.java
@@ -32,7 +32,7 @@ public class LawsPartPmmPartitionInfoServiceImpl extends ServiceImpl<LawsPartPmm
             queryWrapper.eq("IF(l2.id is null,'2','1')",lawsPartPmmPartitionInfo.getStatus());
         }
         if(!StringUtils.isBlank(lawsPartPmmPartitionInfo.getRegPartNameCn())){
-            queryWrapper.eq("reg_part_name_cn",lawsPartPmmPartitionInfo.getRegPartNameCn());
+            queryWrapper.like("l1.reg_part_name_cn",lawsPartPmmPartitionInfo.getRegPartNameCn());
         }
         Page<LawsPartPmmPartitionInfo> page = new Page<>(pageNo, pageSize);
         IPage<LawsPartPmmPartitionInfo> re = lawsPartPmmPartitionInfoMapper.pageList(page, queryWrapper);