From 4709474b9ecd822860fa04cc996c3d45b44c0e6a Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Fri, 14 Aug 2026 10:04:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=85=B3=E8=81=94=E9=A2=84=E5=91=8A=EF=BC=8C?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=81=94=E5=90=88=E6=A0=87=E8=AF=86=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EfcodeCpNoticeServiceImpl.java               | 4 ++++
 .../mapper/enforcementcode/EnforcementRegistrationMapper.xml  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java
index f1ba454b..b898dd15 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java
@@ -89,6 +89,10 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService {
         // 只看自己发布的预告
         Long userId = LoginHelper.getUserId();
         lqw.eq(userId != null, EfcodeCpNotice::getCreateBy, userId);
+        //企业统一信用代码不等于空的
+        lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()),EfcodeCpNotice::getEnterpriseNumber,bo.getEnterpriseNumber());
+         //状态不等于空的
+        lqw.eq(bo.getStatus() != null, EfcodeCpNotice::getStatus, bo.getStatus());
         // 过滤已删除
         lqw.eq(EfcodeCpNotice::getIsDelete, 0);
         // 按创建时间倒序
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
index 07372087..b09fd879 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml
@@ -674,6 +674,8 @@
         er.is_evaluate,
         er.law_id,
         er.law_text,
+        er.has_union,
+        er.union_no,
         COALESCE(ent_count.cnt, 0) as num
         FROM enforcement_registration er
         LEFT JOIN (