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-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipController.java
index 2d5658f..fb66680 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipController.java
@@ -128,6 +128,11 @@
model.addAttribute("couponList", new ArrayList<Coupon>());
}
}
+ else{
+ model.addAttribute("ticketList", new ArrayList<Coupon>());
+
+ }
+
if (vip.getTicketJson() != null && !vip.getTicketJson().isEmpty()){
String ticketJson = vip.getTicketJson();
// 转化为jsonArray
@@ -144,7 +149,12 @@
ticketDetailVOS.add(ticketDetailVO);
}
model.addAttribute("ticketList", ticketDetailVOS);
+
+ }else{
+ model.addAttribute("ticketList", new ArrayList<TicketDetailVO>());
+
}
+
return PREFIX + "vip_edit.html";
}
--
Gitblit v1.7.1