|
@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
|
|
|
|
|
|
import java.io.Serializable;
|
|
import java.io.Serializable;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
/**
|
|
/**
|
|
* <p>
|
|
* <p>
|
|
@@ -181,7 +182,7 @@ public class TRBasicInfo extends BaseEntity implements Serializable {
|
|
public void updateInfo(TRBasicInfo trBasicInfo, ReportCourseBasicInfoDto reportCourseBasicInfoDto, Long userId) {
|
|
public void updateInfo(TRBasicInfo trBasicInfo, ReportCourseBasicInfoDto reportCourseBasicInfoDto, Long userId) {
|
|
this.setValue(trBasicInfo);
|
|
this.setValue(trBasicInfo);
|
|
this.college = reportCourseBasicInfoDto.getCollege();
|
|
this.college = reportCourseBasicInfoDto.getCollege();
|
|
- this.teachingObject = reportCourseBasicInfoDto.getTeachingObject();
|
|
|
|
|
|
+ this.teachingObject = Objects.nonNull(trBasicInfo) && Objects.nonNull(trBasicInfo.getTeachingObject()) && !Objects.equals(trBasicInfo.getTeachingObject(), "") ? trBasicInfo.getTeachingObject() : reportCourseBasicInfoDto.getTeachingObject();
|
|
this.courseDegree = reportCourseBasicInfoDto.getCourseDegree();
|
|
this.courseDegree = reportCourseBasicInfoDto.getCourseDegree();
|
|
this.profession = reportCourseBasicInfoDto.getProfession();
|
|
this.profession = reportCourseBasicInfoDto.getProfession();
|
|
updateInfo(userId);
|
|
updateInfo(userId);
|