From 8370d2cf2912671733b5a8bac77a3e39c039ab20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 24 Sep 2024 16:00:38 +0800
Subject: [PATCH] 'commit'

---
 .../dsideal/resource/Menu/Controller/MenuController.java  | 2 +-
 .../java/com/dsideal/resource/Menu/Model/MenuModel.java   | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

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 e251dee7..4b3f1282 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
@@ -35,7 +35,7 @@ public class MenuController extends Controller {
         String person_id = claims.get("person_id").toString();
 
         //所有菜单
-        List<MenuModel.Menu> menuList = mm.getMenuJson();
+        List<MenuModel.Menu> menuList = mm.fetchMenu(160);
         Kv kv = Kv.by("success", true);
         kv.set("message", "获取成功");
         kv.set("data", JSONUtil.parseArray(menuList));
diff --git a/dsRes/src/main/java/com/dsideal/resource/Menu/Model/MenuModel.java b/dsRes/src/main/java/com/dsideal/resource/Menu/Model/MenuModel.java
index 9eaaf289..b6b7d64f 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Menu/Model/MenuModel.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Menu/Model/MenuModel.java
@@ -1,6 +1,5 @@
 package com.dsideal.resource.Menu.Model;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import lombok.Getter;
@@ -33,18 +32,13 @@ public class MenuModel {
         private boolean isKeepAlive;
     }
 
-    public List<Menu> getMenuJson() throws JsonProcessingException {
-        List<Menu> rootMenu = fetchMenu(160);  // 从父ID为-1开始递归
-        return rootMenu;
-    }
-
     /**
      * 功能：递归获取菜单
      *
      * @param parent_id 父节点ID
      * @return 此父节点下所有的子菜单
      */
-    private List<Menu> fetchMenu(int parent_id) {
+    public List<Menu> fetchMenu(int parent_id) {
         String sql = "select * from t_base_menu where parent_id = ? order by sort_id";
         List<Record> list = Db.find(sql, parent_id);
         List<Menu> res = new ArrayList<>();