From 6120c290b36858b69b0e75f36dd601f3424a3779 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 31 三月 2025 11:52:31 +0800
Subject: [PATCH] 惠民卡代码
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 3 +++
cloud-server-other/src/main/java/com/dsh/other/entity/TStoreOtherConfigTrue.java | 3 ++-
2 files changed, 5 insertions(+), 1 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 aa10f8f..ccec4d5 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
@@ -189,6 +189,9 @@
BeanUtils.copyProperties(worldCupStore,worldCupStoreVO);
// 查询世界杯活动名称
WorldCup byId = worldCupService.getById(worldCupStore.getWorldCupId());
+ if (byId==null){
+ continue;
+ }
if (byId.getStatus()==3 || byId.getStatus()==4){
continue;
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/TStoreOtherConfigTrue.java b/cloud-server-other/src/main/java/com/dsh/other/entity/TStoreOtherConfigTrue.java
index 25bb490..b3ee637 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/TStoreOtherConfigTrue.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/TStoreOtherConfigTrue.java
@@ -23,7 +23,8 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_store_other_config_true")
-public class TStoreOtherConfigTrue extends Model<TStoreOtherConfigTrue> {
+public class
+TStoreOtherConfigTrue extends Model<TStoreOtherConfigTrue> {
private static final long serialVersionUID = 1L;
--
Gitblit v1.7.1