From 450e3169632bfa5ab31da688f7c4dd86883cc4f4 Mon Sep 17 00:00:00 2001
From: fuqingji <51312040@qq.com>
Date: Fri, 20 May 2022 09:50:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BizProjectNotificationServiceImpl.java       | 1 +
 .../projectrecord/service/impl/ProjectRecordServiceImpl.java  | 4 ++++
 2 files changed, 5 insertions(+)

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 1d1b62d..14b6493 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(Objects.isNull(projectRecord.getBusinessModule()), "b.business_module", projectRecord.getBusinessModule())
                 .eq(StringUtils.isNotBlank(projectRecord.getIsPublic()), "b.is_public", projectRecord.getIsPublic())
                 .orderByDesc("a.create_date");
         IPage<ProjectRecordVO> page = projectNotificationMapper.getPageBySupervisor(
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 c057a01..7ff75aa 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(Objects.isNull(projectRecordVO.getBusinessModule())){
+            query.eq("business_module", projectRecordVO.getBusinessModule());
+        }
+
         if(StringUtils.isNotBlank(projectRecordVO.getEbpProjectNumber())){
             query.eq("ebp_project_number", projectRecordVO.getEbpProjectNumber());
         }