Merge branch 'dev_v1.1.1' into release_v1.1.1

merge

themis-business/src/main/java/com/qmth/themis/business/entity/TEExam.java

@@ -173,7 +173,7 @@ public class TEExam extends BaseEntity {
 //    private MonitorRecordEnum monitorRecord;
 
     @ApiModelProperty(value = "开启转录的视频源")
-    @TableField(value = "monitor_record")
+    @TableField(value = "monitor_record", updateStrategy = FieldStrategy.IGNORED)
     private String monitorRecord;
 
     @ApiModelProperty(value = "算分进度")
@@ -246,7 +246,7 @@ public class TEExam extends BaseEntity {
         this.ipAllow = teExamDto.getIpAllow();
         this.scoreStatus = teExamDto.getScoreStatus();
         this.objectiveScorePolicy = teExamDto.getObjectiveScorePolicy();
-        if (Objects.nonNull(teExamDto.getMonitorVideoSource()) && !Objects.equals(teExamDto.getMonitorVideoSource(), "")) {
+        if (Objects.nonNull(teExamDto.getMonitorVideoSource()) && !Objects.equals(teExamDto.getMonitorVideoSource(), "") && teExamDto.getMonitorVideoSource().size() > 0) {
             this.monitorVideoSource = teExamDto.getMonitorVideoSource().toString().trim().replace("[", "").replace("]", "").replaceAll(" ", "");
             if (Objects.equals(this.monitorVideoSource.trim().replaceAll(" ", ""), "")) {
                 this.monitorVideoSource = null;
@@ -254,7 +254,7 @@ public class TEExam extends BaseEntity {
         } else {
             this.monitorVideoSource = null;
         }
-        if (Objects.nonNull(teExamDto.getMonitorRecord()) && !Objects.equals(teExamDto.getMonitorRecord(), "")) {
+        if (Objects.nonNull(teExamDto.getMonitorRecord()) && !Objects.equals(teExamDto.getMonitorRecord(), "") && teExamDto.getMonitorRecord().size() > 0) {
             this.monitorRecord = teExamDto.getMonitorRecord().toString().trim().replace("[", "").replace("]", "").replaceAll(" ", "");
             if (Objects.equals(this.monitorRecord.trim().replaceAll(" ", ""), "")) {
                 this.monitorRecord = null;