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 (