diff --git 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 index cd803d7b..ec93e7fe 100644 --- 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 @@ -9,12 +9,15 @@ import com.hzs.common.core.utils.StringUtils; import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.system.config.BdAdvertBanner; import com.hzs.common.domain.system.config.ext.BdAdvertBannerExt; +import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.base.IMemberServiceApi; import com.hzs.system.config.mapper.BdAdvertBannerMapper; import com.hzs.system.config.service.IBdAdvertBannerService; import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -26,7 +29,6 @@ public class BdAdvertBannerServiceImpl extends ServiceImpl listData(BdAdvertBanner banner, Long userId) { if (null == banner) { @@ -41,10 +43,12 @@ public class BdAdvertBannerServiceImpl extends ServiceImpl qw.isNull(BdAdvertBanner::getPkVertex).or().eq(BdAdvertBanner::getPkVertex, cuMember.getPkVertex())); + }else{ + 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());