From 56404b3610eb483d379338e113c93b63727c7f3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 11 Oct 2024 17:52:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=B3=E9=94=AE=E9=9B=B6?=
 =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=9E=8B=E5=8F=B7=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/modules/laws/part/entity/LawsPartType.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/LawsPartType.java b/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartType.java
index e051e087..a8cb96cb 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartType.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartType.java
@@ -212,7 +212,7 @@ public class LawsPartType implements Serializable {
      */
     @ApiModelProperty(value = "完成时间")
     @Excel(name = "完成时间",format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date successTime;
     /**
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 e7b14fad..a9adb456 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
@@ -29,7 +29,7 @@ public class LawsPartPmmPartitionInfoServiceImpl extends ServiceImpl<LawsPartPmm
             queryWrapper.eq("IF(l2.id is null,'2','1')",lawsPartPmmPartitionInfo.getStatus());
         }
         if(!StringUtils.isBlank(lawsPartPmmPartitionInfo.getFndGpc())){
-            queryWrapper.gt("FIND_IN_SET('" + lawsPartPmmPartitionInfo.getFndGpc() + "',fnd_gpc)", 0);
+            queryWrapper.gt("l2.fnd_gpc", lawsPartPmmPartitionInfo.getFndGpc());
         }
         if(!StringUtils.isBlank(lawsPartPmmPartitionInfo.getRegPartNameCn())){
             queryWrapper.like("l1.reg_part_name_cn",lawsPartPmmPartitionInfo.getRegPartNameCn());