From 8fa7beb4b7d10bb6ab9f98a3c67ed041e7c94d42 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 一月 2026 15:22:03 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index f2c3cb1..921c7f0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -506,8 +506,11 @@
@Override
public R getReceiptAreas(User user) {
Long[] userRoleIds = user.getUserRoleIds();
- List<WarehouseRoleMenu> warehouseRoleMenus = warehouseRoleMenuService.listByIds(Arrays.asList(userRoleIds));
- List<Long> longs = warehouseRoleMenus.stream().map(WarehouseRoleMenu::getId).collect(Collectors.toList());
+ List<WarehouseRoleMenu> warehouseRoleMenus = warehouseRoleMenuService.list(new LambdaQueryWrapper<WarehouseRoleMenu>()
+ .in(WarehouseRoleMenu::getRoleId, Arrays.asList(userRoleIds))
+ );
+ Set<WarehouseRoleMenu> warehouseRoleMenusSet = new HashSet<>(warehouseRoleMenus);
+ List<Long> longs = warehouseRoleMenusSet.stream().map(WarehouseRoleMenu::getMenuId).collect(Collectors.toList());
List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
.eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type)
.in(WarehouseAreas::getId, longs)
@@ -519,6 +522,28 @@
* @param
* @return
* @author Ryan
+ * @description 鑾峰彇闆嗚揣鍖�
+ * @time 2025/3/11 10:12
+ */
+ @Override
+ public R getAreasUserAll(User user) {
+ Long[] userRoleIds = user.getUserRoleIds();
+ List<WarehouseRoleMenu> warehouseRoleMenus = warehouseRoleMenuService.list(new LambdaQueryWrapper<WarehouseRoleMenu>()
+ .in(WarehouseRoleMenu::getRoleId, Arrays.asList(userRoleIds))
+ );
+ Set<WarehouseRoleMenu> warehouseRoleMenusSet = new HashSet<>(warehouseRoleMenus);
+ List<Long> longs = warehouseRoleMenusSet.stream().map(WarehouseRoleMenu::getMenuId).collect(Collectors.toList());
+ List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_COLLECTION.type)
+ .in(WarehouseAreas::getId, longs)
+ );
+ return R.ok(areas);
+ }
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
* @description 鑾峰彇鎵�鏈夊惎鐢ㄥ姩鎬佸瓧娈�
* @time 2025/3/12 09:23
*/
--
Gitblit v1.9.1