angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:0f22ab51c6d5841b1ab555e2548271de21986ed0
Branches Tags
angelo:master
angelo:lx_test
angelo:lx_dev
angelo:bd_dev
angelo:bd_test
angelo:sangelxiu1/fipay
angelo:lx_dev_251104
angelo:bd_online
angelo:lx-dp_online
angelo:lx_online
angelo:lx-mh_online
angelo:bd_dev_image
angelo:bd_dev_20250910
..
compare: angelo:bf510f256655fc9b75d7bb7313e0f42b54d8728f
Branches Tags
angelo:lx_test
angelo:lx_dev
angelo:bd_dev
angelo:bd_test
angelo:sangelxiu1/fipay
angelo:lx_dev_251104
angelo:bd_online
angelo:lx-dp_online
angelo:lx_online
angelo:lx-mh_online
angelo:bd_dev_image
angelo:bd_dev_20250910
angelo:master

No commits in common. "0f22ab51c6d5841b1ab555e2548271de21986ed0" and "bf510f256655fc9b75d7bb7313e0f42b54d8728f" have entirely different histories.
0f22ab51c6 ... bf510f2566

1 changed files with 4 additions and 5 deletions
Show Stats Expand all files Collapse all files

9
bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java
View File

@ -26,6 +26,7 @@ public class BdAdvertBannerServiceImpl extends ServiceImpl<BdAdvertBannerMapper,
@DubboReference @DubboReference
IMemberServiceApi iMemberServiceApi; IMemberServiceApi iMemberServiceApi;
@Override @Override
public List<BdAdvertBanner> listData(BdAdvertBanner banner, Long userId) { public List<BdAdvertBanner> listData(BdAdvertBanner banner, Long userId) {
if (null == banner) { if (null == banner) {
@ -40,12 +41,10 @@ public class BdAdvertBannerServiceImpl extends ServiceImpl<BdAdvertBannerMapper,
queryWrapper.eq(BdAdvertBanner::getPosition, EPositionTwo.POSITION_ONE.getValue()); queryWrapper.eq(BdAdvertBanner::getPosition, EPositionTwo.POSITION_ONE.getValue());
} }
CuMember cuMember = iMemberServiceApi.getMember(userId).getData(); CuMember cuMember = iMemberServiceApi.getMember(userId).getData();
if(ObjectUtil.isEmpty(cuMember)){ if (ObjectUtil.isEmpty(cuMember)) {
queryWrapper.isNull(BdAdvertBanner::getPkVertex); queryWrapper.isNull(BdAdvertBanner::getPkVertex);
}else{ } else {
queryWrapper.and(qw -> qw.isNull(BdAdvertBanner::getPkVertex) queryWrapper.and(qw -> qw.isNull(BdAdvertBanner::getPkVertex).or().eq(BdAdvertBanner::getPkVertex, cuMember.getPkVertex()));
.or()
.eq(ObjectUtil.isNotEmpty(cuMember.getPkVertex()), BdAdvertBanner::getPkVertex, cuMember.getPkVertex()));
} }
queryWrapper.eq(BdAdvertBanner::getPkCountry, CountryConstants.CHINA_COUNTRY); queryWrapper.eq(BdAdvertBanner::getPkCountry, CountryConstants.CHINA_COUNTRY);
queryWrapper.lt(BdAdvertBanner::getEffectiveDate, new Date()); queryWrapper.lt(BdAdvertBanner::getEffectiveDate, new Date());