From e16063d642f1f5e9ff5fe95b96134c5abf2ed7bf Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Mon, 16 Nov 2026 15:41:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF-=E9=A2=84=E5=91=8A?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EfcodeCpNoticeServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 452ca2db..b3f99491 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 @@ -115,10 +115,8 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService { @Override public TableDataInfo entQueryMyPageList(EfcodeCpNoticeBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - lqw.eq(EfcodeCpNotice::getEnterpriseNumber,bo.getEnterpriseNumber()); + // 企业端只查询已发布(待执法)的预告 lqw.eq(EfcodeCpNotice::getStatus, 1L); - // 过滤已删除 - lqw.eq(EfcodeCpNotice::getIsDelete, 0); // 按创建时间倒序 lqw.orderByDesc(EfcodeCpNotice::getCreateTime); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); @@ -354,14 +352,18 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService { lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), EfcodeCpNotice::getEnterpriseName, bo.getEnterpriseName()); lqw.eq(bo.getStatus() != null, EfcodeCpNotice::getStatus, bo.getStatus()); lqw.eq(bo.getIsDelete() != null, EfcodeCpNotice::getIsDelete, bo.getIsDelete()); - + //企业统一信用代码(为空时不作为查询条件) + lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseNumber()), EfcodeCpNotice::getEnterpriseNumber, bo.getEnterpriseNumber()); + lqw.eq(bo.getStatus() != null, EfcodeCpNotice::getStatus, bo.getStatus()); + // 过滤已删除 + lqw.eq(EfcodeCpNotice::getIsDelete, 0); // 搜索值(多字段模糊匹配) if (StringUtils.isNotBlank(bo.getSearchValue())) { String sv = bo.getSearchValue(); lqw.and(wrapper -> wrapper - .like(StringUtils.isNotBlank(bo.getBureauDeptName()), EfcodeCpNotice::getBureauDeptName, sv) - .or().like(StringUtils.isNotBlank(bo.getEnterpriseName()), EfcodeCpNotice::getEnterpriseName, sv) - .or().like(StringUtils.isNotBlank(bo.getEnforceContent()), EfcodeCpNotice::getEnforceContent, sv) + .like(EfcodeCpNotice::getBureauDeptName, sv) + .or().like(EfcodeCpNotice::getEnterpriseName, sv) + .or().like(EfcodeCpNotice::getEnforceContent, sv) ); }