From d12855cadf736f6f31ed2426940c3f23b92ec8e6 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 15:31:43 +0800
Subject: [PATCH] 'commit'

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

diff --git a/dsBase/src/main/java/com/dsideal/base/Menu/Controller/MenuController.java b/dsBase/src/main/java/com/dsideal/base/Menu/Controller/MenuController.java
index 3fcc353d..313092c9 100644
--- a/dsBase/src/main/java/com/dsideal/base/Menu/Controller/MenuController.java
+++ b/dsBase/src/main/java/com/dsideal/base/Menu/Controller/MenuController.java
@@ -155,8 +155,8 @@ public class MenuController extends Controller {
     @EmptyInterface({"menu_name", "url", "memo", "identity_ids"})
     @IsNumericInterface({"parent_id", "sort_id", "for_school", "for_bureau"})
     @LengthInterface({"menu_name,1,32", "memo,1,255"})
-    public void AddMenu(int parent_id, int sort_id, String identity_ids, String menu_name, String url, String memo, int for_school, int for_bureau, String icon, int isFull) {
-        int menu_id = model.AddMenu(parent_id, sort_id, menu_name, url, memo, identity_ids, for_school, for_bureau, icon, isFull);
+    public void AddMenu(int parent_id, int sort_id, String identity_ids, String menu_name, String url, String memo, int for_school, int for_bureau, String big_icon, String small_icon, int isFull) {
+        int menu_id = model.AddMenu(parent_id, sort_id, menu_name, url, memo, identity_ids, for_school, for_bureau, big_icon, small_icon, isFull);
         JSONObject map = new JSONObject();
         map.put("menu_id", menu_id);
         if (menu_id > 0) {
@@ -193,8 +193,8 @@ public class MenuController extends Controller {
     @IsNumericInterface({"menu_id", "sort_id", "for_school", "for_bureau"})
     @LengthInterface({"menu_name,1,32", "memo,1,255"})
     public void UpdateMenu(int menu_id, int sort_id, String menu_name, String identity_ids, String url, String memo,
-                           int for_school, int for_bureau, String icon, int isFull) {
-        model.UpdateMenu(menu_id, menu_name, sort_id, url, memo, identity_ids, for_school, for_bureau, icon, isFull);
+                           int for_school, int for_bureau, String big_icon,String small_icon, int isFull) {
+        model.UpdateMenu(menu_id, menu_name, sort_id, url, memo, identity_ids, for_school, for_bureau, big_icon,small_icon, isFull);
         renderJson(CommonUtil.returnMessageJson(true, "修改成功！"));
     }
 
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 dbaed2df..778de8c4 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 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) {
@@ -231,7 +231,8 @@ public class MenuModel {
         record.set("level_id", level_id);
         record.set("for_school", for_school);
         record.set("for_bureau", for_bureau);
-        record.set("icon", icon);
+        record.set("big_icon", big_icon);
+        record.set("small_icon", small_icon);
         record.set("isFull", isFull);
         Db.save("t_base_menu", "menu_id", record);
         int menu_id = record.getInt("menu_id");
@@ -268,7 +269,8 @@ public class MenuModel {
      * @param url
      * @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 icon,int isFull) {
+    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) {
         Record record = Db.findById("t_base_menu", "menu_id", menu_id);
         if (record == null) {
             return false;
@@ -279,7 +281,8 @@ public class MenuModel {
         record.set("memo", memo);
         record.set("for_school", for_school);
         record.set("for_bureau", for_bureau);
-        record.set("icon",icon);
+        record.set("big_icon",big_icon);
+        record.set("small_icon",small_icon);
         record.set("isFull",isFull);
         Db.update("t_base_menu", "menu_id", record);