From 4bb8a18d89636a685402a12a9f3d93483052e3b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 25 Sep 2024 10:04:54 +0800
Subject: [PATCH] 'commit'

---
 .../resource/Base/Controller/BaseController.java      | 11 ++---------
 .../resource/Menu/Controller/MenuController.java      |  4 ----
 .../java/com/dsideal/resource/Util/CommonUtil.java    |  3 +++
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java
index 7fd024ca..1c961197 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java
@@ -1,8 +1,8 @@
 package com.dsideal.resource.Base.Controller;
 
 import com.dsideal.resource.Base.Model.BaseModel;
+import com.dsideal.resource.Util.CommonUtil;
 import com.jfinal.core.Controller;
-import com.jfinal.kit.Kv;
 import com.jfinal.plugin.activerecord.Record;
 
 import java.util.List;
@@ -15,13 +15,6 @@ public class BaseController extends Controller {
      */
     public void getStageList() {
         List<Record> list = bm.getStageList();
-        Kv kv = Kv.create();
-        kv.set("success", true);
-        kv.set("data", list);
-        kv.set("pageNum", 1);
-        kv.set("pageSize", 10);
-        kv.set("pageNum", list.size());
-        kv.set("data",list);
-        renderJson(kv);
+        renderJson(CommonUtil.renderSuccess(list));
     }
 }
diff --git a/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java b/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java
index f5cff5c7..a3ea119e 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java
@@ -1,16 +1,12 @@
 package com.dsideal.resource.Menu.Controller;
 
 import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.dsideal.resource.Const.RetBean;
 import com.dsideal.resource.Menu.Model.MenuModel;
 import com.dsideal.resource.Util.CommonUtil;
 import com.dsideal.resource.Util.JwtUtil;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.ext.interceptor.GET;
-import com.jfinal.kit.Kv;
 import io.jsonwebtoken.Claims;
 
 import java.util.List;
diff --git a/dsRes/src/main/java/com/dsideal/resource/Util/CommonUtil.java b/dsRes/src/main/java/com/dsideal/resource/Util/CommonUtil.java
index b231ae10..9254e8c4 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Util/CommonUtil.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Util/CommonUtil.java
@@ -432,6 +432,9 @@ public class CommonUtil {
      * <p>
      * data: Map<String,Object>
      */
+    public static Map<String, Object> renderSuccess(List<Record> list) {
+        return renderSuccess(null, list, null, 0, 0, 0);
+    }
     public static Map<String, Object> renderSuccess(String msg, List<Record> list) {
         return renderSuccess(msg, list, null, 0, 0, 0);
     }