From 16aa4fa86c45ad7b8e16ae66f787cdb783ba388a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 21 三月 2024 14:14:10 +0800
Subject: [PATCH] bug修改
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 8 ++++++--
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html | 2 +-
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
index 102a74f..2efebb0 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
@@ -109,13 +109,17 @@
@PostMapping("/worldCup/getWorldCupStoreListByStoreId")
public List<WorldCupStoreVO> getWorldCupStoreListByStoreId(@RequestBody Integer storeId){
List<WorldCupStoreVO> res = new ArrayList<>();
-
- List<WorldCupStore> storeId1 = worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId));
+ List<WorldCupStore> storeId1 = worldCupStoreService.list(
+ new QueryWrapper<WorldCupStore>()
+ .eq("storeId", storeId));
for (WorldCupStore worldCupStore : storeId1) {
WorldCupStoreVO worldCupStoreVO = new WorldCupStoreVO();
BeanUtils.copyProperties(worldCupStore,worldCupStoreVO);
// 查询世界杯活动名称
WorldCup byId = worldCupService.getById(worldCupStore.getWorldCupId());
+ if (byId.getStatus()==3 || byId.getStatus()==4){
+ continue;
+ }
worldCupStoreVO.setName(byId.getName());
res.add(worldCupStoreVO);
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html
index b1e4b4e..b5e0830 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html
@@ -72,7 +72,7 @@
<#button name="SUTU设置" icon="fa-plus" clickFun="TCompetition.addDevice()" space="true"/>
@if(role == '1'){
@if(shiro.hasPermission("/tHomeModule/tHomeModule_platformSet")){
- <#button name="平台首页设置" icon="fa-edit" clickFun="TCompetition.platformSet()" space="true"/>
+ <#button name="图文模块设置" icon="fa-edit" clickFun="TCompetition.platformSet()" space="true"/>
@}
@}
</div>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js
index ed4fb3f..3a12a60 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js
@@ -181,7 +181,7 @@
TCompetition.platformSet = function () {
var index = layer.open({
type: 2,
- title:'平台首页设置',
+ title:'图文模块设置',
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
--
Gitblit v1.7.1