Merge branch 'dev' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementCarouselBannerController.java

@@ -47,6 +47,7 @@ public class AppEnforcementCarouselBannerController extends BaseController {
         if (bo.getTargetPlatforms() == null || bo.getTargetPlatforms().isEmpty()) {
             bo.setTargetPlatforms(Arrays.asList(0, 1));
         }
+        bo.setStatus(2L);
         return enforcementCarouselBannerService.queryPageList(bo, pageQuery);
     }
 

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);
         // 按创建时间倒序

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 (