From 873a960d3a1eb9905ca9e714122db6da629c2b3c Mon Sep 17 00:00:00 2001 From: lifenlong Date: Sat, 26 Jun 2021 15:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E7=9B=B4=E6=92=AD=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=B1=95=E7=A4=BA=E5=BD=93=E5=89=8D=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../broadcast/serviceimpl/StudioServiceImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java b/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java index c751a61a..990dd0cd 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java @@ -5,6 +5,7 @@ import cn.lili.common.delayqueue.BroadcastMessage; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; +import cn.lili.common.security.enums.UserEnums; import cn.lili.common.trigger.enums.DelayTypeEnums; import cn.lili.common.trigger.interfaces.TimeTrigger; import cn.lili.common.trigger.model.TimeExecuteConstant; @@ -155,9 +156,9 @@ public class StudioServiceImpl extends ServiceImpl impleme public Boolean push(Integer roomId, Integer goodsId) { //判断直播间是否已添加商品 - if(studioCommodityService.getOne( - new LambdaQueryWrapper().eq(StudioCommodity::getRoomId,roomId) - .eq(StudioCommodity::getGoodsId,goodsId))!=null){ + if (studioCommodityService.getOne( + new LambdaQueryWrapper().eq(StudioCommodity::getRoomId, roomId) + .eq(StudioCommodity::getGoodsId, goodsId)) != null) { throw new ServiceException(ResultCode.STODIO_GOODS_EXIST_ERROR); } @@ -195,10 +196,14 @@ public class StudioServiceImpl extends ServiceImpl impleme @Override public IPage studioList(PageVO pageVO, Integer recommend, String status) { - return this.page(PageUtil.initPage(pageVO), new QueryWrapper() + QueryWrapper queryWrapper = new QueryWrapper() .eq(recommend != null, "recommend", true) .eq(status != null, "status", status) - .orderByDesc("create_time")); + .orderByDesc("create_time"); + if (UserContext.getCurrentUser().getRole().equals(UserEnums.STORE)) { + queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId()); + } + return this.page(PageUtil.initPage(pageVO), queryWrapper); }