From 008ffb622f7e8b941245a4cf19042c7baef39b24 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 21 九月 2026 10:21:32 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java
index 291dc07..08335a4 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java
@@ -56,13 +56,13 @@
shopId = member.getRelationShopId();
}
}
+ Page<AppActivityPageVo> page = new Page<>();
if(shopId==null){
- throw new ServiceException(AppErrorConstant.NO_POSITION);
+ return R.ok(page);
}
// if(member!=null&&member.getBindingFlag()==0){
// shopId = null;
// }
- Page<AppActivityPageVo> page = new Page<>();
page.setSize(appPageDto.getPageSize());
page.setCurrent(appPageDto.getPageNum());
List<AppActivityPageVo> activityPageVoList = activityService.pageAppActivity(page,shopId);
--
Gitblit v1.7.1