From c502c6116f761205982cfc3478fa86eec1a4db6b Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Mon, 30 Dec 2024 11:05:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E7=B4=A2=E8=8F=B2=E4=BA=9A?=
 =?UTF-8?q?=E5=B7=A5=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 增加华之韵物流对接
---
 .../factorydata/suofeiya/mapper/DeliveryNoteMapper.java  | 2 +-
 .../suofeiya/service/impl/DeliveryNoteServiceImpl.java   | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mapper/DeliveryNoteMapper.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mapper/DeliveryNoteMapper.java
index e42167b0c..1f374a62a 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mapper/DeliveryNoteMapper.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mapper/DeliveryNoteMapper.java
@@ -17,7 +17,7 @@ import java.util.List;
 @Mapper
 public interface DeliveryNoteMapper extends BaseMapper<DeliveryNoteEntity> {
 
-	FactoryAuthVO findFactoryAuth(@Param("companyCode") String companyCode);
+	List<FactoryAuthVO> findFactoryAuth(@Param("companyCode") String companyCode);
 
 	List<FactoryAuthVO> findFactoryAuthByTenantCode(@Param("tenantId") String tenantId);
 }
diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java
index 8c83e0c84..e5b1bcc02 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java
@@ -259,9 +259,12 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			if (StrUtil.isNotBlank(json)) {
 				return JSONUtil.toBean(json, FactoryAuthVO.class);
 			} else {
-				FactoryAuthVO factoryAuth = baseMapper.findFactoryAuth(companyCode);
-				bladeRedis.setEx(key, JSONUtil.toJsonStr(factoryAuth), Duration.ofDays(1));
-				return factoryAuth;
+				List<FactoryAuthVO> factoryAuth = baseMapper.findFactoryAuth(companyCode);
+				if(CollUtil.isNotEmpty(factoryAuth)){
+					FactoryAuthVO authVO = factoryAuth.get(0);
+					bladeRedis.setEx(key, JSONUtil.toJsonStr(authVO), Duration.ofDays(1));
+					return authVO;
+				}
 			}
 		}
 		return null;