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 selectStoreBySid(String sid) { List pagging = baseMapper.selectStoreBySid(sid); + List 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