From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java
index e3e6a1b..be846b2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java
@@ -13,6 +13,7 @@
 import com.vincent.rsf.server.common.utils.NodeUtils;
 import com.vincent.rsf.server.manager.entity.MenuPda;
 import com.vincent.rsf.server.manager.service.MenuPdaService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
 import com.vincent.rsf.server.system.controller.BaseController;
 import com.vincent.rsf.server.system.entity.Menu;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,25 +34,26 @@
     public R page(@RequestBody Map<String, Object> map) {
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<MenuPda, BaseParam> pageParam = new PageParam<>(baseParam, MenuPda.class);
-        return R.ok().add(menuPdaService.page(pageParam, pageParam.buildWrapper(true)));
+        PageParam<MenuPda, BaseParam> page = menuPdaService.page(pageParam, pageParam.buildWrapper(true));
+        return R.ok().add(buildPageRowsUtils.rowsMap(page));
     }
 
     @PreAuthorize("hasAuthority('manager:menuPda:list')")
     @PostMapping("/menuPda/list")
     public R list(@RequestBody Map<String, Object> map) {
-        return R.ok().add(menuPdaService.list());
+        return R.ok().add(buildPageRowsUtils.rowsMap(menuPdaService.list()));
     }
 
     @PreAuthorize("hasAuthority('manager:menuPda:list')")
     @PostMapping({ "/menuPda/many/{ids}", "/menuPdas/many/{ids}" })
     public R many(@PathVariable Long[] ids) {
-        return R.ok().add(menuPdaService.listByIds(Arrays.asList(ids)));
+        return R.ok().add(buildPageRowsUtils.rowsMap(menuPdaService.listByIds(Arrays.asList(ids))));
     }
 
     @PreAuthorize("hasAuthority('manager:menuPda:list')")
     @GetMapping("/menuPda/{id}")
     public R get(@PathVariable("id") Long id) {
-        return R.ok().add(menuPdaService.getById(id));
+        return R.ok().add(buildPageRowsUtils.rowsMap(menuPdaService.getById(id)));
     }
 
     // @PreAuthorize("hasAuthority('system:menu:list')")
@@ -71,7 +73,7 @@
             Utils.treeRemove(treeData, String.valueOf(map.get("condition")), MenuPda::getName, MenuPda::getChildren);
             Utils.treeRemove(treeData, String.valueOf(map.get("condition")), MenuPda::getName, MenuPda::getChildren);
         }
-        return R.ok().add(treeData);
+        return R.ok().add(buildPageRowsUtils.rowsMap(treeData));
     }
 
     @PreAuthorize("hasAuthority('system:menu:save')")
@@ -109,7 +111,7 @@
             createButtonForMenu(menu, "submit", "鎻愪氦", 2);
         }
 
-        return R.ok("Save Success").add(menu);
+        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(menu));
     }
 
     /**
@@ -166,7 +168,7 @@
         if (!menuPdaService.updateById(menu)) {
             return R.error("Update Fail");
         }
-        return R.ok("Update Success").add(menu);
+        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(menu));
     }
 
     @PreAuthorize("hasAuthority('manager:menuPda:remove')")
@@ -176,7 +178,7 @@
         if (!menuPdaService.removeByIds(Arrays.asList(ids))) {
             return R.error("Delete Fail");
         }
-        return R.ok("Delete Success").add(ids);
+        return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
     }
 
     @PreAuthorize("hasAuthority('manager:menuPda:list')")
@@ -189,13 +191,13 @@
         }
         menuPdaService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                 item -> vos.add(new KeyValVo(item.getId(), item.getName())));
-        return R.ok().add(vos);
+        return R.ok().add(buildPageRowsUtils.rowsMap(vos));
     }
 
     @PreAuthorize("hasAuthority('manager:menuPda:list')")
     @PostMapping("/menuPda/export")
     public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
-        ExcelUtil.build(ExcelUtil.create(menuPdaService.list(), MenuPda.class), response);
+        ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(menuPdaService.list()), MenuPda.class), response);
     }
 
 }

--
Gitblit v1.9.1