Merge remote-tracking branch 'origin/bd_dev' into bd_test

# Conflicts: # bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java
## 直播出现问题修复；
2025-08-18 09:38:00 +08:00 · 2025-08-18 09:36:59 +08:00 · 2025-08-18 09:34:47 +08:00 · 2025-08-18 09:34:37 +08:00 · 2025-08-18 09:20:48 +08:00 · 2025-08-14 09:31:50 +08:00
1 changed files with 5 additions and 4 deletions
--- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java
+++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java
@ -26,7 +26,6 @@ public class BdAdvertBannerServiceImpl extends ServiceImpl<BdAdvertBannerMapper,
    @DubboReference
    IMemberServiceApi iMemberServiceApi;
    @Override
    public List<BdAdvertBanner> listData(BdAdvertBanner banner, Long userId) {
        if (null == banner) {
@ -41,10 +40,12 @@ public class BdAdvertBannerServiceImpl extends ServiceImpl<BdAdvertBannerMapper,
            queryWrapper.eq(BdAdvertBanner::getPosition, EPositionTwo.POSITION_ONE.getValue());
        }
        CuMember cuMember = iMemberServiceApi.getMember(userId).getData();
-        if (ObjectUtil.isEmpty(cuMember)) {
+        if(ObjectUtil.isEmpty(cuMember)){
            queryWrapper.isNull(BdAdvertBanner::getPkVertex);
-        } else {
+        }else{
-            queryWrapper.and(qw -> qw.isNull(BdAdvertBanner::getPkVertex).or().eq(BdAdvertBanner::getPkVertex, cuMember.getPkVertex()));
+            queryWrapper.and(qw ->  qw.isNull(BdAdvertBanner::getPkVertex)
                    .or()
                    .eq(ObjectUtil.isNotEmpty(cuMember.getPkVertex()), BdAdvertBanner::getPkVertex, cuMember.getPkVertex()));
        }
        queryWrapper.eq(BdAdvertBanner::getPkCountry, CountryConstants.CHINA_COUNTRY);
        queryWrapper.lt(BdAdvertBanner::getEffectiveDate, new Date());