|
@@ -80,7 +80,7 @@ public class TrialSampleInfoServiceImpl extends BaseServiceImpl<TrialSampleInfoM
|
|
|
return trialSampleInfo != null;
|
|
|
} else {
|
|
|
TrialSampleInfo trialSampleInfo = list.stream().filter(f -> f.getId().equals(Long.parseLong(id))).findAny().orElse(null);
|
|
|
- if (trialSampleInfo != null && !trialSampleInfo.getSpecificationNumber().equals(specificationNumber)) {
|
|
|
+ if (trialSampleInfo != null && trialSampleInfo.getSpecificationNumber() != null && !trialSampleInfo.getSpecificationNumber().equals(specificationNumber)) {
|
|
|
TrialSampleInfo trialSampleInfo1 = list.stream().filter(f -> f.getSpecificationNumber().equals(specificationNumber)).findAny().orElse(null);
|
|
|
return trialSampleInfo1 != null;
|
|
|
}
|