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

---
 .../com/dsideal/base/Menu/Model/MenuModel.java     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java b/dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java
index 778de8c4..2a692594 100644
--- a/dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java
+++ b/dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java
@@ -214,7 +214,7 @@ public class MenuModel {
      * @param url
      * @param memo
      */
-    public int AddMenu(int parent_id, int sort_id, String menu_name, String url, String memo, String identity_ids, int for_school, int for_bureau, String big_icon,String small_icon, int isFull) {
+    public int AddMenu(int parent_id, int sort_id, String menu_name, String url, String memo, String identity_ids, int for_school, int for_bureau, String big_icon, String small_icon, int isFull) {
         //查找它父结点的level_id
         Record record = Db.findById("t_base_menu", "menu_id", parent_id);
         if (record == null) {
@@ -270,7 +270,7 @@ public class MenuModel {
      * @param memo
      */
     public boolean UpdateMenu(int menu_id, String menu_name, int sort_id, String url, String memo, String identity_ids,
-                              int for_school, int for_bureau,String big_icon,String small_icon,int isFull) {
+                              int for_school, int for_bureau, String big_icon, String small_icon, int isFull) {
         Record record = Db.findById("t_base_menu", "menu_id", menu_id);
         if (record == null) {
             return false;
@@ -281,9 +281,9 @@ public class MenuModel {
         record.set("memo", memo);
         record.set("for_school", for_school);
         record.set("for_bureau", for_bureau);
-        record.set("big_icon",big_icon);
-        record.set("small_icon",small_icon);
-        record.set("isFull",isFull);
+        record.set("big_icon", big_icon);
+        record.set("small_icon", small_icon);
+        record.set("isFull", isFull);
         Db.update("t_base_menu", "menu_id", record);
 
         //保存菜单与身份的关系
@@ -337,6 +337,7 @@ public class MenuModel {
     @Setter
     public static class Meta {
         private String icon;
+        private String big_icon;
         private String title;
         private String isLink;
         private boolean isHide;
@@ -369,7 +370,8 @@ public class MenuModel {
             sMenu.setComponent(url);
 
             Meta meta = new Meta();
-            meta.setIcon(rs.getStr("icon"));
+            meta.setIcon(rs.getStr("small_icon"));
+            meta.setBig_icon(rs.getStr("big_icon"));
             meta.setTitle(rs.getStr("menu_name"));
             meta.setIsLink("");
             meta.setHide(false);