From fdb5092264e639488b85cf8512928cbc685b4b5c Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 30 Oct 2023 16:06:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crm/biz/storehouseproject/StoreHouseProjectService.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java
index bd9fd156..fa182d2f 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java
@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -70,6 +71,7 @@ public class StoreHouseProjectService extends MybatisBaseService<StoreHouseProje
     }
     public List<StoreHouseProjectVo> selectStoreBySid(String sid) {
         List<StoreHouseProjectVo> pagging = baseMapper.selectStoreBySid(sid);
+        List<StoreHouseProjectVo> pagging1 = new ArrayList<>();
         for(StoreHouseProjectVo vo:pagging){
             String shSid=vo.getShSid();
             ShStorehouseVo shStorehouseVo=shStorehouseFeign.selectStoreBySid(shSid).getData();
@@ -79,9 +81,10 @@ public class StoreHouseProjectService extends MybatisBaseService<StoreHouseProje
                 vo.setAddress(shStorehouseVo.getAddress());
                 vo.setLinkerName(shStorehouseVo.getLinkerName());
                 vo.setLinkerPhone(shStorehouseVo.getLinkerPhone());
+                pagging1.add(vo);
             }
         }
-        return pagging;
+        return pagging1;
     }
     public StoreHouseProjectVo selectProjectByshSid(String sid) {
         StoreHouseProjectVo pagging = baseMapper.selectProjectByshSid(sid);