From 77c6744454e7f35e73f7a79ccec431410c097566 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期二, 02 九月 2025 17:56:37 +0800 Subject: [PATCH] bug修改 --- cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java | 7 +++++-- 1 files changed, 5 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 2b5e035..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,15 +65,17 @@ 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()); vo.setIsTop(homeModule.getIsTop()); vo.setSort(homeModule.getSort()); vo.setBackgroundImage(homeModule.getBackgroundImage()); + vo.setDisplayType(homeModule.getDisplayType()); + vo.setId(homeModule.getId()); listVo.add(vo); } for (StoreConfig storeConfig : list) { @@ -130,6 +132,7 @@ storeConfigVo.setBackgroundImage(ToolUtil.isNotEmpty(worldCupStore.getBackgroundImage()) ? worldCupStore.getBackgroundImage() : worldCup.getHomeBackdropImg()); storeConfigVo.setType(9); storeConfigVo.setIsOpen(worldCupStore.getIsOpen()); + storeConfigVo.setDisplayType(worldCupStore.getDisplayType()); storeConfigVo.setSort(worldCupStore.getSort()); listVo.add(storeConfigVo); } -- Gitblit v1.7.1