From 0920be497d5028a5535019b3ba54d7897d51cc9c Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 28 八月 2024 11:29:13 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024

---
 Tiger.Model.Net/Entitys/SYS/MenuItem.cs |    1 +
 Tiger.Business/SYS/Biz.SYS_MENU.cs      |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Tiger.Business/SYS/Biz.SYS_MENU.cs b/Tiger.Business/SYS/Biz.SYS_MENU.cs
index 8c5a5a1..dc0e77f 100644
--- a/Tiger.Business/SYS/Biz.SYS_MENU.cs
+++ b/Tiger.Business/SYS/Biz.SYS_MENU.cs
@@ -227,6 +227,7 @@
                         func.COMPONENT = string.IsNullOrEmpty(data.component) && data.func_type == "0" ? "LAYOUT" : data.component;
                         func.IGNOREKEEPALIVE = data.keepalive;
                         func.SHOW = data.show;
+                        func.FUNC_GROUP = data.func_group;
                         //func.CURRENTACTIVEMENU = data.keepalive
                     }
                     else
@@ -237,7 +238,7 @@
                             FUNC_CODE = Guid.NewGuid().ToString("N"),
                             FUNC_NAME = data.menuName,
                             FUNC_DESC = data.menuName,
-                            FUNC_GROUP = "",
+                            FUNC_GROUP = data.func_group,
                             FUNC_TYPE = data.func_type,
                             BUTTON_TYPE = data.btnType,
                             DO_METHOD = data.doMethod,
@@ -341,6 +342,7 @@
                     menuItem.btnType = item.BUTTON_TYPE;
                     menuItem.doMethod = item.DO_METHOD;
                     menuItem.parentMenu = item.PFUNC_CODE;
+                    menuItem.func_group = item.FUNC_GROUP;
                     menuItem.orderNo = item.SEQ_NO;
                     menuItem.status = item.IS_USE;
                     menuItem.children = null;
diff --git a/Tiger.Model.Net/Entitys/SYS/MenuItem.cs b/Tiger.Model.Net/Entitys/SYS/MenuItem.cs
index 6d0506b..876b4a0 100644
--- a/Tiger.Model.Net/Entitys/SYS/MenuItem.cs
+++ b/Tiger.Model.Net/Entitys/SYS/MenuItem.cs
@@ -100,6 +100,7 @@
         public bool isUpdate { get; set; }
         public string show { get; set; }
         public string func_type { get; set; }
+        public string func_group { get; set; }
         public string func_class { get; set; }
         public string keepalive { get; set; }
         public int btnType { get; set; }

--
Gitblit v1.9.3