From 9fcfdf5aef9c75e0b75f6e5b6ec9badb650914dc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:58:26 +0800
Subject: [PATCH] 供应商仓库接口修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmWarehouseController.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmWarehouseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmWarehouseController.java
index 377f98a..517a58d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmWarehouseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmWarehouseController.java
@@ -81,25 +81,32 @@
*/
@ApiOperation(value = "获取crm供应商下的仓库管理列表")
@PostMapping(value = "/listBySupplierId")
- public R<List<TCrmWarehouse>> listBySupplierId() {
+ public R<TCrmWarehouse> listBySupplierId() {
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
Long userId = tokenService.getLoginUser().getUserId();
if(roleType == 4){
TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
.eq(TCrmSupplier::getUserId, userId)
.last("LIMIT 1"));
- List<TCrmSupplierToWarehouse> list = crmSupplierToWarehouseService.list(Wrappers.lambdaQuery(TCrmSupplierToWarehouse.class)
- .eq(TCrmSupplierToWarehouse::getSupplierId, crmSupplier.getId()));
- if(CollectionUtils.isEmpty(list)){
- return R.ok();
- }
- List<String> warehouseIds = list.stream().map(TCrmSupplierToWarehouse::getWarehouseId).collect(Collectors.toList());
- List<TCrmWarehouse> crmWarehouseList = crmWarehouseService.list(Wrappers.lambdaQuery(TCrmWarehouse.class)
- .eq(TCrmWarehouse::getStatus, 1)
- .in(TCrmWarehouse::getId, warehouseIds)
- .orderByDesc(TCrmWarehouse::getCreateTime));
- return R.ok(crmWarehouseList);
+ TCrmWarehouse crmWarehouse = crmWarehouseService.getById(crmSupplier.getWarehouseId());
+ return R.ok(crmWarehouse);
}
+// if(roleType == 4){
+// TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
+// .eq(TCrmSupplier::getUserId, userId)
+// .last("LIMIT 1"));
+// List<TCrmSupplierToWarehouse> list = crmSupplierToWarehouseService.list(Wrappers.lambdaQuery(TCrmSupplierToWarehouse.class)
+// .eq(TCrmSupplierToWarehouse::getSupplierId, crmSupplier.getId()));
+// if(CollectionUtils.isEmpty(list)){
+// return R.ok();
+// }
+// List<String> warehouseIds = list.stream().map(TCrmSupplierToWarehouse::getWarehouseId).collect(Collectors.toList());
+// List<TCrmWarehouse> crmWarehouseList = crmWarehouseService.list(Wrappers.lambdaQuery(TCrmWarehouse.class)
+// .eq(TCrmWarehouse::getStatus, 1)
+// .in(TCrmWarehouse::getId, warehouseIds)
+// .orderByDesc(TCrmWarehouse::getCreateTime));
+// return R.ok(crmWarehouseList);
+// }
return R.ok();
}
--
Gitblit v1.7.1