|
@@ -137,7 +137,7 @@ public class TRBasicInfo extends BaseEntity implements Serializable {
|
|
this.enable = true;
|
|
this.enable = true;
|
|
this.reportResult = new ReportResult();
|
|
this.reportResult = new ReportResult();
|
|
this.profession = profession;
|
|
this.profession = profession;
|
|
- this.courseDegree = courseDegree;
|
|
|
|
|
|
+ this.courseDegree = Objects.nonNull(courseDegree) ? courseDegree : this.courseDegree;
|
|
this.courseEnName = courseEnName;
|
|
this.courseEnName = courseEnName;
|
|
this.finishPoints = finishPoints;
|
|
this.finishPoints = finishPoints;
|
|
this.requirementPoints = requirementPoints;
|
|
this.requirementPoints = requirementPoints;
|
|
@@ -219,7 +219,7 @@ public class TRBasicInfo extends BaseEntity implements Serializable {
|
|
this.teachingObject = trBasicInfo.getTeachingObject();
|
|
this.teachingObject = trBasicInfo.getTeachingObject();
|
|
this.selectionCount = trBasicInfo.getSelectionCount();
|
|
this.selectionCount = trBasicInfo.getSelectionCount();
|
|
this.participantCount = trBasicInfo.getParticipantCount();
|
|
this.participantCount = trBasicInfo.getParticipantCount();
|
|
- this.courseDegree = trBasicInfo.getCourseDegree();
|
|
|
|
|
|
+ this.courseDegree = Objects.nonNull(trBasicInfo.getCourseDegree()) ? trBasicInfo.getCourseDegree() : this.courseDegree;
|
|
this.teacher = trBasicInfo.getTeacher();
|
|
this.teacher = trBasicInfo.getTeacher();
|
|
this.director = trBasicInfo.getDirector();
|
|
this.director = trBasicInfo.getDirector();
|
|
this.participant = trBasicInfo.getParticipant();
|
|
this.participant = trBasicInfo.getParticipant();
|