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/LocAreaController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java
index 52b8c9f..6a2cc9c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java
@@ -12,16 +12,16 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.LocArea;
import com.vincent.rsf.server.manager.service.LocAreaService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
-@Api(tags = "閫昏緫鍒嗗尯")
@RestController
public class LocAreaController extends BaseController {
@@ -33,7 +33,9 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<LocArea, BaseParam> pageParam = new PageParam<>(baseParam, LocArea.class);
- return R.ok().add(locAreaService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<LocArea, BaseParam> page = locAreaService.page(pageParam, pageParam.buildWrapper(true));
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:locArea:list')")
@@ -63,9 +65,6 @@
}
if (Objects.isNull(locArea.getAreaId())) {
throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
- }
- if (Objects.isNull(locArea.getLocId())) {
- throw new CoolException("搴撲綅涓嶈兘涓虹┖锛侊紒");
}
locArea.setCreateBy(getLoginUserId());
--
Gitblit v1.9.1