|
@@ -1,5 +1,6 @@
|
|
|
package org.springblade.business.service.impl;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import org.springblade.business.entity.TrialCyFinishTestReport;
|
|
@@ -59,7 +60,7 @@ public class TrialCyServiceImpl implements TrialCyService {
|
|
|
@Override
|
|
|
public Page<ThirdReportVo> getTrialDetectionReport(TrialCyThirdReportQueryVo queryVo) {
|
|
|
TrialCyTestType byId = trialCyTestTypeService.getById(queryVo.getNodeId());
|
|
|
- if(byId == null){
|
|
|
+ if(StringUtils.isNotBlank(byId.getId())){
|
|
|
return new Page<>();
|
|
|
}
|
|
|
queryVo.setNodeId(Long.valueOf(byId.getId()));
|
|
@@ -70,7 +71,7 @@ public class TrialCyServiceImpl implements TrialCyService {
|
|
|
@Override
|
|
|
public Page<ThirdReportVo> getThirdReport(TrialCyThirdReportQueryVo queryVo) {
|
|
|
TrialCyTestType byId = trialCyTestTypeService.getById(queryVo.getNodeId());
|
|
|
- if(byId == null){
|
|
|
+ if(StringUtils.isNotBlank(byId.getId())){
|
|
|
return new Page<>();
|
|
|
}
|
|
|
queryVo.setNodeId(Long.valueOf(byId.getId()));
|