Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
This commit is contained in:
commit
71cc57959b
@ -228,7 +228,7 @@ public class PointsGoodsServiceImpl extends ServiceImpl<PointsGoodsMapper, Point
|
|||||||
@Override
|
@Override
|
||||||
public IPage<PointsGoodsVO> getPointsGoodsByPage(PointsGoodsSearchParams searchParams, PageVO page) {
|
public IPage<PointsGoodsVO> getPointsGoodsByPage(PointsGoodsSearchParams searchParams, PageVO page) {
|
||||||
IPage<PointsGoodsVO> pointsGoodsPage = new Page<>();
|
IPage<PointsGoodsVO> pointsGoodsPage = new Page<>();
|
||||||
if (UserContext.getCurrentUser().getRole().equals(UserEnums.MEMBER)) {
|
if (UserContext.getCurrentUser() == null || UserContext.getCurrentUser().getRole().equals(UserEnums.MEMBER)) {
|
||||||
searchParams.setPromotionStatus(PromotionStatusEnum.START.name());
|
searchParams.setPromotionStatus(PromotionStatusEnum.START.name());
|
||||||
}
|
}
|
||||||
Query query = searchParams.mongoQuery();
|
Query query = searchParams.mongoQuery();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user