代码调整

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportCourseBasicInfoDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description: 报告课程基本情况dto
@@ -73,7 +74,7 @@ public class ReportCourseBasicInfoDto implements Serializable {
         this.teachingObject = trBasicInfo.getTeachingObject();
         this.selectionCount = trBasicInfo.getSelectionCount();
         this.participantCount = trBasicInfo.getParticipantCount();
-        this.courseDegree = trBasicInfo.getCourseDegree();
+        this.courseDegree = Objects.nonNull(trBasicInfo.getCourseDegree()) ? trBasicInfo.getCourseDegree() : this.courseDegree;
         this.teacher = trBasicInfo.getTeacher();
         this.director = trBasicInfo.getDirector();
         this.participant = trBasicInfo.getParticipant();

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TRBasicInfo.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * <p>
@@ -249,7 +250,7 @@ public class TRBasicInfo extends BaseEntity implements Serializable {
         this.reportResult = new ReportResult();
         this.cultureProgramId = cultureProgramId;
         this.courseId = courseId;
-        this.courseDegree = courseDegree;
+        this.courseDegree = Objects.nonNull(courseDegree) ? courseDegree : this.courseDegree;
         this.profession = profession;
         this.courseEnName = courseEnName;
         this.college = college;