简柏林 / thingskit · Commits

Commit 326bf5aebfe757023dfd2c419f8900101ccae164

Authored by 胡翰林
1 parent 9f8b8454

接口联调修改

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
@@ -25,7 +25,7 @@ import java.util.stream.Collectors; @@ -25,7 +25,7 @@ import java.util.stream.Collectors;
25 @Slf4j 25 @Slf4j
26 public class TkInspectionDetailsServiceImpl extends AbstractBaseService<TkInspectionDetailsMapper, TkInspectionDetailsEntity> 26 public class TkInspectionDetailsServiceImpl extends AbstractBaseService<TkInspectionDetailsMapper, TkInspectionDetailsEntity>
27 implements TkInspectionDetailsService { 27 implements TkInspectionDetailsService {
28 - private TkDeviceAccountService tkDeviceAccountService; 28 + private final TkDeviceAccountService tkDeviceAccountService;
29 29
30 @Override 30 @Override
31 public List<TkInspectionDetailsDTO> batchSave(List<TkInspectionDetailsDTO> tkInspectionDetailsDTOList, String inspectionRecordId) { 31 public List<TkInspectionDetailsDTO> batchSave(List<TkInspectionDetailsDTO> tkInspectionDetailsDTOList, String inspectionRecordId) {
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 import lombok.RequiredArgsConstructor; 6 import lombok.RequiredArgsConstructor;
7 import lombok.extern.slf4j.Slf4j; 7 import lombok.extern.slf4j.Slf4j;
8 import org.apache.commons.collections.CollectionUtils; 8 import org.apache.commons.collections.CollectionUtils;
  9 +import org.apache.commons.lang3.EnumUtils;
9 import org.apache.commons.lang3.StringUtils; 10 import org.apache.commons.lang3.StringUtils;
10 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
11 import org.thingsboard.server.common.data.exception.ThingsboardException; 12 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -49,8 +50,7 @@ public class TkPreservePlanServiceImpl extends AbstractBaseService<TkPreservePla @@ -49,8 +50,7 @@ public class TkPreservePlanServiceImpl extends AbstractBaseService<TkPreservePla
49 if (StringUtils.isNotBlank(condition.getPreserveName())) { 50 if (StringUtils.isNotBlank(condition.getPreserveName())) {
50 lambda.like(TkPreservePlanEntity::getPreserveName, condition.getPreserveName()); 51 lambda.like(TkPreservePlanEntity::getPreserveName, condition.getPreserveName());
51 } 52 }
52 -  
53 - if (condition.getStatus() != null) { 53 + if (condition.getStatus() != null && StringUtils.isNotBlank(condition.getStatus().toString())) {
54 lambda.eq(TkPreservePlanEntity::getStatus, condition.getStatus()); 54 lambda.eq(TkPreservePlanEntity::getStatus, condition.getStatus());
55 } 55 }
56 56