From f697280f473e9387ee387f25a678f113d734c9fe Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 26 九月 2025 18:31:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSupplierServiceImpl.java | 69 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSupplierServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSupplierServiceImpl.java
index 65d9130..b5d8fb8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSupplierServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmSupplierServiceImpl.java
@@ -48,16 +48,15 @@
if(CollectionUtils.isEmpty(list)){
return pageInfo;
}
- List<String> supplierIds = list.stream().map(TCrmSupplierVO::getId).collect(Collectors.toList());
- List<TCrmSupplierToWarehouse> crmSupplierToWarehouses = crmSupplierToWarehouseService.list(Wrappers.lambdaQuery(TCrmSupplierToWarehouse.class)
- .eq(TCrmSupplierToWarehouse::getSupplierId, supplierIds));
- for (TCrmSupplierVO crmSupplierVO : list) {
- List<TCrmSupplierToWarehouse> supplierToWarehouses = crmSupplierToWarehouses.stream().filter(crmSupplierToWarehouse -> crmSupplierToWarehouse.getSupplierId().equals(crmSupplierVO.getId())).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(supplierToWarehouses)){
- List<String> warehouseIds = supplierToWarehouses.stream().map(TCrmSupplierToWarehouse::getWarehouseId).collect(Collectors.toList());
- crmSupplierVO.setWarehouseIds(warehouseIds);
- }
- }
+// List<String> supplierIds = list.stream().map(TCrmSupplierVO::getId).collect(Collectors.toList());
+// List<TCrmSupplierToWarehouse> crmSupplierToWarehouses = crmSupplierToWarehouseService.list(Wrappers.lambdaQuery(TCrmSupplierToWarehouse.class)
+// .eq(TCrmSupplierToWarehouse::getSupplierId, supplierIds));
+// for (TCrmSupplierVO crmSupplierVO : list) {
+// List<TCrmSupplierToWarehouse> supplierToWarehouses = crmSupplierToWarehouses.stream().filter(crmSupplierToWarehouse -> crmSupplierToWarehouse.getSupplierId().equals(crmSupplierVO.getId())).collect(Collectors.toList());
+// if(!CollectionUtils.isEmpty(supplierToWarehouses)){
+// crmSupplierVO.setWarehouseId(warehouseIds);
+// }
+// }
pageInfo.setRecords(list);
return pageInfo;
}
@@ -71,17 +70,17 @@
}
this.save(dto);
// 添加供应商和仓库关联关系
- TCrmSupplierToWarehouse crmSupplierToWarehouse = new TCrmSupplierToWarehouse();
- List<String> warehouseIds = dto.getWarehouseIds();
- if(!CollectionUtils.isEmpty(warehouseIds)){
- List<TCrmSupplierToWarehouse> crmSupplierToWarehouses = new ArrayList<>();
- for (String warehouseId : warehouseIds) {
- crmSupplierToWarehouse.setSupplierId(dto.getId());
- crmSupplierToWarehouse.setWarehouseId(warehouseId);
- crmSupplierToWarehouses.add(crmSupplierToWarehouse);
- }
- crmSupplierToWarehouseService.saveBatch(crmSupplierToWarehouses);
- }
+// TCrmSupplierToWarehouse crmSupplierToWarehouse = new TCrmSupplierToWarehouse();
+// List<String> warehouseIds = dto.getWarehouseIds();
+// if(!CollectionUtils.isEmpty(warehouseIds)){
+// List<TCrmSupplierToWarehouse> crmSupplierToWarehouses = new ArrayList<>();
+// for (String warehouseId : warehouseIds) {
+// crmSupplierToWarehouse.setSupplierId(dto.getId());
+// crmSupplierToWarehouse.setWarehouseId(warehouseId);
+// crmSupplierToWarehouses.add(crmSupplierToWarehouse);
+// }
+// crmSupplierToWarehouseService.saveBatch(crmSupplierToWarehouses);
+// }
// 添加账号
SysUser user = new SysUser();
user.setUserName(dto.getAccount());
@@ -107,20 +106,20 @@
}
SysUser user = sysUserService.selectUserById(dto.getUserId());
this.updateById(dto);
- // 删除供应商和仓库关联关系
- crmSupplierToWarehouseService.remove(Wrappers.lambdaQuery(TCrmSupplierToWarehouse.class).eq(TCrmSupplierToWarehouse::getSupplierId, dto.getId()));
- // 添加供应商和仓库关联关系
- List<String> warehouseIds = dto.getWarehouseIds();
- if(!CollectionUtils.isEmpty(warehouseIds)){
- List<TCrmSupplierToWarehouse> crmSupplierToWarehouses = new ArrayList<>();
- for (String warehouseId : warehouseIds) {
- TCrmSupplierToWarehouse crmSupplierToWarehouse = new TCrmSupplierToWarehouse();
- crmSupplierToWarehouse.setSupplierId(dto.getId());
- crmSupplierToWarehouse.setWarehouseId(warehouseId);
- crmSupplierToWarehouses.add(crmSupplierToWarehouse);
- }
- crmSupplierToWarehouseService.saveBatch(crmSupplierToWarehouses);
- }
+// // 删除供应商和仓库关联关系
+// crmSupplierToWarehouseService.remove(Wrappers.lambdaQuery(TCrmSupplierToWarehouse.class).eq(TCrmSupplierToWarehouse::getSupplierId, dto.getId()));
+// // 添加供应商和仓库关联关系
+// List<String> warehouseIds = dto.getWarehouseIds();
+// if(!CollectionUtils.isEmpty(warehouseIds)){
+// List<TCrmSupplierToWarehouse> crmSupplierToWarehouses = new ArrayList<>();
+// for (String warehouseId : warehouseIds) {
+// TCrmSupplierToWarehouse crmSupplierToWarehouse = new TCrmSupplierToWarehouse();
+// crmSupplierToWarehouse.setSupplierId(dto.getId());
+// crmSupplierToWarehouse.setWarehouseId(warehouseId);
+// crmSupplierToWarehouses.add(crmSupplierToWarehouse);
+// }
+// crmSupplierToWarehouseService.saveBatch(crmSupplierToWarehouses);
+// }
if(Objects.nonNull(user)){
// 修改账号
user.setPhonenumber(dto.getPhone());
--
Gitblit v1.7.1