修改可输入委托下样品编号重复问题；

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java

@@ -667,12 +667,12 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
                 if (isSubmit) {
                     if (StringUtils.isBlank(sample.getCode())) {
                         handleSampleCode(entrust, sample);
-                        updateSampleList.add(sample);
                     }
                     if (StringUtils.isNotBlank(sample.getCode())) {
                         RestAssert.fail(entrustSampleService.isRepeatSampleCode(sample), String.format("样品编号【%s】重复！", sample.getCode()));
                     }
                 }
+                updateSampleList.add(sample);
 
                 // if (null != sample.getId()) {
                 //     handleSampleCode(entrust, sample);
@@ -1297,7 +1297,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
 
     private List<EntrustSampleDTO> listSampleDTOByType(Long entrustId, int type) {
         List<EntrustSampleDTO> sampleDTOList = baseMapper.listByContractId(entrustId);
-        return sampleDTOList.stream().filter(t -> (null == t.getType() ? 0 : t.getType().intValue()) == type).collect(Collectors.toList());
+        return sampleDTOList.stream().filter(t -> (null == t.getType() ? 0 : t.getType()) == type).collect(Collectors.toList());
     }
 
     /* 导出检测委托书 */