From eb552cfbc91d4cd8034edbe3945e6fc668cc8963 Mon Sep 17 00:00:00 2001
From: huangrenya <hry1204@153.com>
Date: Fri, 8 Mar 2024 09:28:06 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B0=B4=E9=97=B8/=E5=A0=A4?=
 =?UTF-8?q?=E9=98=B2=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E8=A1=8C=E6=94=BF?=
 =?UTF-8?q?=E5=8C=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java | 2 ++
 .../src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java
index 23c2aa5a..e4dc760c 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java
@@ -8,6 +8,7 @@ import com.kms.yg.df.mapper.BsSgcDfJbxxMapper;
 import com.kms.yg.sz.domain.BsSgcSzGcda;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.service.BaseService;
+import com.shuili.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,6 +37,7 @@ public class BsSgcDfJbxxService extends BaseService<BsSgcDfJbxxMapper, BsSgcDfJb
             String projectName = projectInfo.getDikeName();
             String projectType = projectInfo.getDikeType();
 
+            queryWrapper.eq(StringUtils.isNotBlank(projectInfo.getAdcdStart()), "ADCD_START", projectInfo.getAdcdStart());
             queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
             queryWrapper.like(projectName != null, "dike_name", projectName);
             queryWrapper.like(projectType != null, "dike_type", projectType);
diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java
index 81a67511..eeffd800 100644
--- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java
@@ -7,6 +7,7 @@ import com.kms.yg.sz.domain.BsSgcSzGcda;
 import com.kms.yg.sz.mapper.BsSgcSzGcdaMapper;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.service.BaseService;
+import com.shuili.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,6 +36,7 @@ public class BsSgcSzGcdaService extends BaseService<BsSgcSzGcdaMapper, BsSgcSzGc
             String projectType = projectInfo.getWagaType();
 
             queryWrapper.isNull("EXPR_DATE");
+            queryWrapper.eq(StringUtils.isNotBlank(projectInfo.getAdcd()), "adcd", projectInfo.getAdcd());
             queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
             queryWrapper.like(projectName != null, "waga_name", projectName);
             queryWrapper.like(projectType != null, "waga_type", projectType);