From dd046d8bed00a7815bb6a61a9e4f4d8964f0b2a1 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 13 二月 2025 14:57:27 +0800
Subject: [PATCH] 全局Result重新修改

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
index 989bdd6..040af38 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
@@ -1,21 +1,17 @@
 package com.ruoyi.web.controller.system;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.Result;
 import com.ruoyi.common.core.domain.entity.Custom;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.service.CustomService;
-import com.ruoyi.system.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.Map;
+import java.util.List;
 
 
 /**
@@ -33,9 +29,9 @@
     private CustomService customService;
 
     @ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
-    @PostMapping("/selectCustomPageList")
-    public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
-        return Result.success(customService.selectCustomPageList(null, null));
+    @GetMapping("/selectCustomPageList")
+    public Result<IPage<Custom>> selectCustomPageList(Page page, Custom custom) throws Exception {
+        return Result.success(customService.selectCustomPageList(page, custom));
     }
     @ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
     @PostMapping("/delCustomById")
@@ -56,5 +52,11 @@
         return Result.success(customService.upCustom(custom));
     }
 
+    @ApiOperation(value = "鑾峰彇瀹㈡埛鏋氫妇")
+    @GetMapping ("/selectCustomEnum")
+    public Result<List<Custom>> selectCustomEnum(){
+        return Result.success(customService.selectCustomEnum());
+    }
+
 }
 

--
Gitblit v1.9.3