From 197431f6ce578d87a0156d2b8b13f1d327ba5e1e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 30 一月 2024 14:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
index 0f9a839..bbf7b1d 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
@@ -115,7 +115,9 @@
             cancelClassesVO.setStartAndEnd(temp);
             TCoursePackagePayment byId = coursePackagePaymentService.getById(cancelClassesVO.getCoursePackagePaymentId());
             cancelClassesVO.setStoreName(storeClient.queryStoreById(cancelClassesVO.getStoreId()).getName());
-            cancelClassesVO.setStudentName(studentClient.queryStudentById(byId.getStudentId()).getName());
+            if(null != byId){
+                cancelClassesVO.setStudentName(studentClient.queryStudentById(byId.getStudentId()).getName());
+            }
             cancelClassesVO.setCoachName(coachClient.queryCoachById(cancelClassesVO.getCoachId()).getName());
 
         }

--
Gitblit v1.7.1