From 2b2e8603381d62b5da4a817710b33d583561ff3f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 12 九月 2025 09:27:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java
index 1a0168f..f02a264 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java
@@ -65,9 +65,9 @@
try {
List<StoreConfig> list = storeConfigService.list(new QueryWrapper<StoreConfig>().eq("storeId", storeId)
.orderByAsc("sort").eq("isOpen", 1));
- HomeModule homeModule = homeModuleService.getOne(new QueryWrapper<HomeModule>().eq("isOpen", 1));
+ List<HomeModule> homeModules = homeModuleService.list(new QueryWrapper<HomeModule>().eq("isOpen", 1).eq("storeId",storeId));
List<StoreConfigVo> listVo = new ArrayList<>();
- if(null != homeModule){
+ for (HomeModule homeModule : homeModules) {
StoreConfigVo vo = new StoreConfigVo();
vo.setType(0);
vo.setIsOpen(homeModule.getIsOpen());
@@ -75,6 +75,7 @@
vo.setSort(homeModule.getSort());
vo.setBackgroundImage(homeModule.getBackgroundImage());
vo.setDisplayType(homeModule.getDisplayType());
+ vo.setId(homeModule.getId());
listVo.add(vo);
}
for (StoreConfig storeConfig : list) {
--
Gitblit v1.7.1