|
@@ -155,7 +155,9 @@ public class EntrustInfoServiceImpl extends BaseServiceImpl<EntrustInfoMapper, E
|
|
|
entrustInfo.setSampleStatus("0");
|
|
|
}else {
|
|
|
if(!"51".equals(nodeType)){
|
|
|
- entrustInfo = baseMapper.selectOne(Wrappers.<EntrustInfo>query().lambda().eq(EntrustInfo::getSampleId, sampleId).eq(EntrustInfo::getContractId,contractId));
|
|
|
+ if (sampleId != null && !sampleId.isEmpty() && !"0".equals(sampleId)) {
|
|
|
+ entrustInfo = baseMapper.selectOne(Wrappers.<EntrustInfo>query().lambda().eq(EntrustInfo::getSampleId, sampleId).eq(EntrustInfo::getContractId,contractId));
|
|
|
+ }
|
|
|
}else {
|
|
|
entrustInfo = baseMapper.selectOne(Wrappers.<EntrustInfo>query().lambda().eq(EntrustInfo::getId,dataInfo.get("id")).eq(EntrustInfo::getContractId,contractId));
|
|
|
}
|