Showing
1 changed file
with
2 additions
and
2 deletions
| @@ -51,7 +51,7 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect | @@ -51,7 +51,7 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect | ||
| 51 | condition.setTenantId(tenantId); | 51 | condition.setTenantId(tenantId); |
| 52 | List<TkInspectionPlanDTO> tkInspectionPlanDTOList = tkInspectionPlanService.selectByCondition(condition); | 52 | List<TkInspectionPlanDTO> tkInspectionPlanDTOList = tkInspectionPlanService.selectByCondition(condition); |
| 53 | if (CollectionUtils.isEmpty(tkInspectionPlanDTOList)) { | 53 | if (CollectionUtils.isEmpty(tkInspectionPlanDTOList)) { |
| 54 | - return new TkPageData<>(); | 54 | + return new TkPageData<>(new ArrayList<>(0), 0); |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | List<String> inspectionPlanIdList = tkInspectionPlanDTOList.stream().map(TkInspectionPlanDTO::getId).collect(Collectors.toList()); | 57 | List<String> inspectionPlanIdList = tkInspectionPlanDTOList.stream().map(TkInspectionPlanDTO::getId).collect(Collectors.toList()); |
| @@ -77,7 +77,7 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect | @@ -77,7 +77,7 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect | ||
| 77 | String deviceId = queryMap.get("deviceId").toString(); | 77 | String deviceId = queryMap.get("deviceId").toString(); |
| 78 | List<String> inspectionRecordIdList = tkInspectionDetailsService.getDeviceRetaInspectionRecordId(deviceId); | 78 | List<String> inspectionRecordIdList = tkInspectionDetailsService.getDeviceRetaInspectionRecordId(deviceId); |
| 79 | if (CollectionUtils.isEmpty(inspectionRecordIdList)) { | 79 | if (CollectionUtils.isEmpty(inspectionRecordIdList)) { |
| 80 | - return new TkPageData<>(); | 80 | + return new TkPageData<>(new ArrayList<>(0), 0); |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | lambda.in(TkInspectionRecordEntity::getId, inspectionRecordIdList); | 83 | lambda.in(TkInspectionRecordEntity::getId, inspectionRecordIdList); |