From 5988d25f2cef42efeaef4709e1e343c087aaed79 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 23 Oct 2024 03:48:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=87=BA=E6=9D=A5=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/service/impl/BasicdataClientServiceImpl.java | 7 +++++--
 .../distribution/mapper/DistributionStockArticleMapper.xml | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
index 24663cad5..d933fb1e5 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java
@@ -813,15 +813,18 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 
 	@Override
 	public List<JSONObject> findListByClientName(String clientName, String linkMan, String linkPhone) {
-
+		List<JSONObject> list = new ArrayList<>();
 		List<ClientInfoVO> ls = baseMapper.findListByClientName(clientName, linkMan, linkPhone);
 		//把ls中所有元素的clientId放入一个list中
 		List<Long> clientIds = ls.stream().map(ClientInfoVO::getClientId).collect(Collectors.toList());
+		if(clientIds.isEmpty()){
+			return list;
+		}
 		List<BasicdataStoreBrandEntity> storeBrandEntities = basicdataStoreBrandService.findListByClientIds(clientIds);
 		//把storeBrandEntities中所有元素通过clientId分组
 		Map<Long, List<BasicdataStoreBrandEntity>> collect = storeBrandEntities.stream().collect(Collectors.groupingBy(BasicdataStoreBrandEntity::getClientId));
 
-		List<JSONObject> list = new ArrayList<>();
+//		List<JSONObject> list = new ArrayList<>();
 		for (ClientInfoVO clientInfoVO : ls) {
 			Long clientId = clientInfoVO.getClientId();
 			List<BasicdataStoreBrandEntity> storeBrandEntityList = collect.get(clientId);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index e0a26adbe..8796c30f7 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -600,7 +600,7 @@
                 and ldsa.type_service =#{param.typeService}
             </if>
 
-            <if test="   param.idsList != null  ">and ldsa.id in
+            <if test="  param.idsList != null  ">and ldsa.id in
                 <foreach collection="param.idsList" open="(" item="a" close=")" separator=",">
                     #{a}
                 </foreach>