Merge branch 'gaoying' into 'dev'

Gaoying

See merge request !104

quality-review/src/main/java/com/ruoyi/service/impl/SampleManagementServiceImpl.java

@@ -71,10 +71,12 @@ public class SampleManagementServiceImpl extends ServiceImpl<SampleManagementMap
     public int insertSampleManagement(Sample sampleManagement)
     {
         // 判断车辆识别码是否重复
+        if(Sample.SAMPLE_FLAG_CAR.equals(sampleManagement.getFlag())){
             int dentificationCode = sampleManagementMapper.selectIdentificationCodeCount(sampleManagement);
             if(dentificationCode>0){
                 throw new ServiceException("车辆识别码已存在");
             }
+        }
         // 判断样品编号是否存在
         int sampleNumber = sampleManagementMapper.selectSampleNumberCount(sampleManagement);
         if(sampleNumber>0){
@@ -95,10 +97,12 @@ public class SampleManagementServiceImpl extends ServiceImpl<SampleManagementMap
     public int updateSampleManagement(Sample sampleManagement)
     {
         // 判断车辆识别码是否重复
+        if(Sample.SAMPLE_FLAG_CAR.equals(sampleManagement.getFlag())){
             int dentificationCode = sampleManagementMapper.selectIdentificationCodeCount(sampleManagement);
             if(dentificationCode>0){
                 throw new ServiceException("车辆识别码已存在");
             }
+        }
         // 判断样品编号是否存在
         int sampleNumber = sampleManagementMapper.selectSampleNumberCount(sampleManagement);
         if(sampleNumber>0){