接口联调修改

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class TkInspectionDetailsServiceImpl extends AbstractBaseService<TkInspectionDetailsMapper, TkInspectionDetailsEntity>
         implements TkInspectionDetailsService {
-    private TkDeviceAccountService tkDeviceAccountService;
+    private final TkDeviceAccountService tkDeviceAccountService;
 
     @Override
     public List<TkInspectionDetailsDTO> batchSave(List<TkInspectionDetailsDTO> tkInspectionDetailsDTOList, String inspectionRecordId) {

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.EnumUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -49,8 +50,7 @@ public class TkPreservePlanServiceImpl extends AbstractBaseService<TkPreservePla
         if (StringUtils.isNotBlank(condition.getPreserveName())) {
             lambda.like(TkPreservePlanEntity::getPreserveName, condition.getPreserveName());
         }
-
-        if (condition.getStatus() != null) {
+        if (condition.getStatus() != null && StringUtils.isNotBlank(condition.getStatus().toString())) {
             lambda.eq(TkPreservePlanEntity::getStatus, condition.getStatus());
         }