chenhongyan1989 1 рік тому
батько
коміт
7224021525

+ 3 - 2
energy-manage-service/src/main/java/com/energy/manage/service/service/datatransfer/impl/DataTransferServiceImpl.java

@@ -253,7 +253,7 @@ public class DataTransferServiceImpl implements DataTransferService {
         dataTransferPo.setCreateBy(userId);
         dataTransferPo.setUpdateBy(userId);
         DataTransferTypePathDto pathDto = getTransferAddr(dataTransferDto,dataTransferType);
-        if(pathDto != null && StringUtils.isNotBlank(pathDto.getTransferAddr())){
+        if(pathDto != null){
             dataTransferPo.setTransferAddr(pathDto.getTransferAddr());
 //            dataTransferPo.setTransferState(DATA_TRANSFERING_STATE);
         }
@@ -271,7 +271,8 @@ public class DataTransferServiceImpl implements DataTransferService {
      */
     private DataTransferTypePathDto getTransferAddr(DataTransferDto dataTransferDto,String dataTransferType){
         List<DataTransferTypePathDto>  pathDtoList = dataTransferDto.getDataTransferTypePathDtoList();
-        return pathDtoList.stream().filter(item -> item.getTransferType().equals(dataTransferType)).findFirst().orElse(null);
+        return pathDtoList.stream().filter(item -> item.getTransferType().equals(dataTransferType)
+                                                    && StringUtils.isNotBlank(item.getTransferAddr())).findFirst().orElse(null);
     }