From 2eb5989cc052af1537d82e819248fa929fd14d52 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 17 Mar 2021 11:19:50 +0800
Subject: [PATCH] 分销订单0317
---
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java
index ac4ce8b..2795142 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java
@@ -15,11 +15,9 @@
import com.matrix.system.fenxiao.service.FenXiaoSettingService;
import com.matrix.system.fenxiao.vo.FenXiaoSettingVo;
import com.matrix.system.hive.action.util.QueryUtil;
-import com.matrix.system.hive.bean.ShoppingGoods;
import com.matrix.system.hive.dao.ShoppingGoodsDao;
import com.matrix.system.shopXcx.bean.ShopProduct;
import com.matrix.system.shopXcx.dao.ShopProductDao;
-
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -96,10 +94,14 @@
idsList.add(parseInt);
}
}
- List<ShoppingGoods> list = shoppingGoodsDao.selectByIds(idsList);
- result.putInMap("order", list);
+ //List<ShoppingGoods> list = shoppingGoodsDao.selectByIds(idsList);
+ List<ShopProduct> shopProducts = shopProductDao.selectByIds(idsList);
+ result.putInMap("order", shopProducts);
}
- }
+ }else{
+ List<ShopProduct> shopProducts = new ArrayList<>();
+ result.putInMap("order", shopProducts);
+ }
}
}
return result;
--
Gitblit v1.9.1