Merge remote-tracking branch 'origin/develop_master' into develop_1

# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 
 import static com.adc.da.login.util.UserUtils.getUserName;
+
 /**
  * <p>
  * 服务实现类
@@ -253,6 +254,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
         else list.setFileIds(detailedUpDto.getFileIds());
 
         sarLawsDetailedListDao.updateById(list);
+        if (null != detailedUpDto.getInforlist()) {
             detailedUpDto.setInforlist(detailedUpDto.getInforlist().substring(1, detailedUpDto.getInforlist().length() - 1));
             List<TimeDto> timeDto = new ArrayList<>();
             if (detailedUpDto.getInforlist().indexOf(",") >= 0) {
@@ -289,6 +291,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                 timeDto.add(dto);
             }
             service.updateDetailedLaws(detailedUpDto.getId(), timeDto);
+        }
         return "修改成功";
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java

@@ -140,12 +140,15 @@ public class SarStandUnqualified extends BaseEntity {
 
 
     @ApiModelProperty(value = "质量工程师")
+    @TableField(exist=false)
     private String qaEngineerName;
 
     @ApiModelProperty(value = "认证工程师")
+    @TableField(exist=false)
     private String authEngineerName;
 
     @ApiModelProperty(value = "责任工程师")
+    @TableField(exist=false)
     private String dutyEngineerName;