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>