修复课程查询异常

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseStudent.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * @Author: cy
@@ -65,6 +67,9 @@ public class CourseStudent implements Serializable {
     @ApiModelProperty(value = "老师评价 0:未评价 1:已评价")
     private Integer teacherReplied;
 
+    @ApiModelProperty(value = "课程名称")
+    private String courseName;
+
     public Integer getStudentReplied() {
         return studentReplied;
     }
@@ -154,7 +159,8 @@ public class CourseStudent implements Serializable {
     }
 
     public String getName() {
-        return name;
+
+        return Optional.ofNullable(name).orElse(getCourseName());
     }
 
     public void setName(String name) {
@@ -208,5 +214,13 @@ public class CourseStudent implements Serializable {
     public void setImGroupId(String imGroupId) {
         this.imGroupId = imGroupId;
     }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
 }
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -466,6 +466,7 @@
             s.end_time_ AS endTime,
             s.type_ AS courseType,
             s.status_ AS `status`,
+            NULL AS courseName,
             u.id_ AS userId,
             u.username_ AS name,
             u.real_name_ AS realName,
@@ -496,8 +497,9 @@
             s.end_time_ AS endTime,
             s.type_ AS courseType,
             s.status_ AS `status`,
+            CONCAT(g.name_,'-第',s.class_num_,'课') AS courseName,
             NULL AS userId,
-            CONCAT(g.name_,'-第',s.class_num_,'课') AS name,
+            NULL AS name,
             NULL AS realName,
             g.background_pic_ AS cover,
             g.subject_id_ AS subjectId,