diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
index 905c1789..82ac1338 100644
--- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.lili.modules.page.serviceimpl;
 
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.lili.common.enums.ClientTypeEnum;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.SwitchEnum;
@@ -80,8 +81,8 @@ public class PageDataServiceImpl extends ServiceImpl<PageDataMapper, PageData> i
         //如果页面为发布，则关闭其他页面，开启此页面
         if (pageData.getPageShow() != null && pageData.getPageShow().equals(SwitchEnum.OPEN.name())) {
             LambdaUpdateWrapper<PageData> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
-            lambdaUpdateWrapper.eq(PageData::getPageType, pageData.getPageType());
-            lambdaUpdateWrapper.eq(PageData::getPageClientType, pageData.getPageClientType());
+            lambdaUpdateWrapper.eq(CharSequenceUtil.isNotEmpty(pageData.getPageType()), PageData::getPageType, pageData.getPageType());
+            lambdaUpdateWrapper.eq(CharSequenceUtil.isNotEmpty(pageData.getPageClientType()), PageData::getPageClientType, pageData.getPageClientType());
             lambdaUpdateWrapper.set(PageData::getPageShow, SwitchEnum.CLOSE.name());
             this.update(lambdaUpdateWrapper);
         } else {
diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java
index b78c98c0..8a130ef9 100644
--- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java
@@ -44,7 +44,9 @@ public class CouponManagerController {
     @ApiOperation(value = "获取优惠券列表")
     @GetMapping
     public ResultMessage<IPage<CouponVO>> getCouponList(CouponSearchParams queryParam, PageVO page) {
-        queryParam.setStoreId(PromotionTools.PLATFORM_ID);
+        if (queryParam.getStoreId() == null) {
+            queryParam.setStoreId(PromotionTools.PLATFORM_ID);
+        }
         return ResultUtil.data(couponService.pageVOFindAll(queryParam, page));
     }