From dec64d47a9a3a3cc133afdf5141744d90fcb49b4 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 01 九月 2025 15:46:42 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai 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