From f27309d45c7ef46b0aea98107b67d0c5b46d4217 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 10:00:26 +0800
Subject: [PATCH] fix: remove broken duplicate page return
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
index 24421bd..f8ad0f1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
@@ -12,9 +12,11 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.Warehouse;
import com.vincent.rsf.server.manager.entity.WarehouseAreas;
+import com.vincent.rsf.server.manager.entity.vo.WarehouseVO;
import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.manager.service.WarehouseService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -24,6 +26,7 @@
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@Api(tags = "浠撳簱")
@RestController
@@ -43,7 +46,9 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Warehouse, BaseParam> pageParam = new PageParam<>(baseParam, Warehouse.class);
- return R.ok().add(warehouseService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<Warehouse, BaseParam> page = warehouseService.page(pageParam, pageParam.buildWrapper(true));
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:warehouse:list')")
@@ -53,6 +58,20 @@
}
@PreAuthorize("hasAuthority('manager:warehouse:list')")
+ @PostMapping("/warehouse/list2")
+ public R list2(@RequestBody Map<String, Object> map) {
+ List<Warehouse> warehouseList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().select(Warehouse::getId,Warehouse::getName));
+
+ List<WarehouseVO> warehouseList2 = warehouseList.stream().map(warehouse -> {
+ WarehouseVO vo = new WarehouseVO();
+ vo.setId(warehouse.getId());
+ vo.setName(warehouse.getName());
+ return vo;
+ }).collect(Collectors.toList());
+ return R.ok().add(warehouseList2);
+ }
+
+ @PreAuthorize("hasAuthority('manager:warehouse:list')")
@PostMapping({"/warehouse/many/{ids}", "/warehouses/many/{ids}"})
public R many(@PathVariable Long[] ids) {
return R.ok().add(warehouseService.listByIds(Arrays.asList(ids)));
--
Gitblit v1.9.1