From a54c2f42db2790dc70412d39d5cbb86954b9468e Mon Sep 17 00:00:00 2001
From: liuh <gipsyliu@163.com>
Date: Tue, 17 May 2022 14:54:42 +0800
Subject: [PATCH 1/3] =?UTF-8?q?add=20=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectrecord/service/impl/ProjectRecordServiceImpl.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
index 68f6e95..b6d6701 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
@@ -195,6 +195,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
             query.eq("is_public", projectRecordVO.getIsPublic());
         }
 
+        if(StringUtils.isNotBlank(projectRecordVO.getEbpProjectId())){
+            query.eq("ebp_project_number", projectRecordVO.getEbpProjectNumber());
+        }
+
         if(null != projectRecordVO.getLimit()){
             query.last("limit "+ projectRecordVO.getLimit());
         }

From 32104533eafe90b152c11baf0d2976c4340c72c0 Mon Sep 17 00:00:00 2001
From: liuh <gipsyliu@163.com>
Date: Tue, 17 May 2022 14:55:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?add=20=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectrecord/service/impl/ProjectRecordServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
index b6d6701..79c79de 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
@@ -195,7 +195,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
             query.eq("is_public", projectRecordVO.getIsPublic());
         }
 
-        if(StringUtils.isNotBlank(projectRecordVO.getEbpProjectId())){
+        if(StringUtils.isNotBlank(projectRecordVO.getEbpProjectNumber())){
             query.eq("ebp_project_number", projectRecordVO.getEbpProjectNumber());
         }
 

From 62ece6a4a804e6cecc9e02ef8e4826b59ec3ce7e Mon Sep 17 00:00:00 2001
From: fuqingji <51312040@qq.com>
Date: Thu, 19 May 2022 10:49:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=B6=E8=97=8F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BizProjectNotificationServiceImpl.java          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/BizProjectNotificationServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/BizProjectNotificationServiceImpl.java
index b662a22..1d1b62d 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/BizProjectNotificationServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/BizProjectNotificationServiceImpl.java
@@ -116,6 +116,7 @@ public class BizProjectNotificationServiceImpl extends BaseServiceImpl<BizProjec
                 .ne("a.status", "d")
                 .like(StringUtils.isNotBlank(projectRecord.getProjectName()), "b.project_name", projectRecord.getProjectName())
                 .eq(StringUtils.isNotBlank(projectRecord.getBidMethodDict()), "b.bid_method_dict", projectRecord.getBidMethodDict())
+                .eq(StringUtils.isNotBlank(projectRecord.getIsPublic()), "b.is_public", projectRecord.getIsPublic())
                 .orderByDesc("a.create_date");
         IPage<ProjectRecordVO> page = projectNotificationMapper.getPageBySupervisor(
                 new Page<>(projectRecord.getBasePageRequest().getPageNo(), projectRecord.getBasePageRequest().getPageSize()),