From ff636d822e327602f0c9a609d5f6d01cc22e5e86 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期一, 05 八月 2024 15:02:22 +0800 Subject: [PATCH] 增加可以临时存储数据库提交操作,待需要的时候再提交 --- Tiger.Business/SYS/Biz.SYS_MENU.cs | 104 ++++++++++++++++++++++++++------------------------- 1 files changed, 53 insertions(+), 51 deletions(-) diff --git a/Tiger.Business/SYS/Biz.SYS_MENU.cs b/Tiger.Business/SYS/Biz.SYS_MENU.cs index 903b3db..96cb053 100644 --- a/Tiger.Business/SYS/Biz.SYS_MENU.cs +++ b/Tiger.Business/SYS/Biz.SYS_MENU.cs @@ -123,60 +123,62 @@ { func = Biz.Db.Queryable<SYS_MENU>().Where(x => x.FUNC_NAME == menuName).First(); } - string rootCode = func == null ? "0" : func.FUNC_CODE; - var items = await Biz.Db.Queryable<SYS_MENU>() - .WhereIF(!string.IsNullOrEmpty(status),q=>q.IS_USE == status) - .OrderBy(x => x.SEQ_NO) - .Distinct().ToListAsync(); - List<SYS_MENU> entities = items.OrderBy(x => x.SEQ_NO).ToList().FindAll(t => t.PFUNC_CODE == rootCode); - foreach (var item in entities) + if (func != null) { - MenuItem menuItem = new(); - menuItem.id = item.ID; - menuItem.func_code = item.FUNC_CODE; - menuItem.path = (item.PATH ?? "").StartsWith("/dashboard") ? "/dashboard" : $"{item.PATH}"; - menuItem.name = item.FUNC_NAME; - menuItem.component = (item.PATH == null || item.PATH == "#") ? "LAYOUT" : item.COMPONENT; - menuItem.meta = new(); - menuItem.meta.icon = item.ICON_URL; // item.ICON_URL; - menuItem.meta.orderNo = item.SEQ_NO; - menuItem.meta.title = item.FUNC_NAME; - menuItem.meta.menuId = item.ID; - menuItem.meta.menuCode = item.FUNC_CODE; - menuItem.meta.btnType = item.BUTTON_TYPE; - menuItem.meta.doMethod = item.DO_METHOD; - if (!string.IsNullOrEmpty(item.IGNOREKEEPALIVE)) + var items = await Biz.Db.Queryable<SYS_MENU>() + .WhereIF(!string.IsNullOrEmpty(status), q => q.IS_USE == status) + .OrderBy(x => x.SEQ_NO) + .Distinct().ToListAsync(); + List<SYS_MENU> entities = items.OrderBy(x => x.SEQ_NO).ToList().FindAll(t => t.PFUNC_CODE == func.FUNC_CODE); + foreach (var item in entities) { - menuItem.meta.ignoreKeepAlive = item.IGNOREKEEPALIVE == "0" ? true : false; + MenuItem menuItem = new(); + menuItem.id = item.ID; + menuItem.func_code = item.FUNC_CODE; + menuItem.path = (item.PATH ?? "").StartsWith("/dashboard") ? "/dashboard" : $"{item.PATH}"; + menuItem.name = item.FUNC_NAME; + menuItem.component = (item.PATH == null || item.PATH == "#") ? "LAYOUT" : item.COMPONENT; + menuItem.meta = new(); + menuItem.meta.icon = item.ICON_URL; // item.ICON_URL; + menuItem.meta.orderNo = item.SEQ_NO; + menuItem.meta.title = item.FUNC_NAME; + menuItem.meta.menuId = item.ID; + menuItem.meta.menuCode = item.FUNC_CODE; + menuItem.meta.btnType = item.BUTTON_TYPE; + menuItem.meta.doMethod = item.DO_METHOD; + if (!string.IsNullOrEmpty(item.IGNOREKEEPALIVE)) + { + menuItem.meta.ignoreKeepAlive = item.IGNOREKEEPALIVE == "0" ? true : false; + } + if (!string.IsNullOrEmpty(item.CURRENTACTIVEMENU)) + { + menuItem.meta.currentActiveMenu = item.CURRENTACTIVEMENU; + } + if (!string.IsNullOrEmpty(item.SHOW)) + { + menuItem.meta.hideMenu = item.SHOW == "1" ? true : false; + menuItem.meta.showMenu = item.SHOW == "0" ? true : false; + } + if (!string.IsNullOrEmpty(item.IGNOREAUTH)) + { + menuItem.meta.ignoreAuth = item.IGNOREAUTH == "Y"; + } + menuItem.keepalive = item.IGNOREKEEPALIVE; + menuItem.show = item.SHOW; + menuItem.menuName = item.FUNC_NAME; + menuItem.createTime = item.CREATE_TIME; + menuItem.status = item.IS_USE; + menuItem.icon = menuItem.meta.icon; + menuItem.func_type = item.FUNC_TYPE; + menuItem.btnType = item.BUTTON_TYPE; + menuItem.doMethod = item.DO_METHOD; + menuItem.parentMenu = item.PFUNC_CODE; + menuItem.orderNo = item.SEQ_NO; + menuItem.children = null; + GetMenuItem(items, item.FUNC_CODE, ref menuItem); + data.Add(menuItem); } - if (!string.IsNullOrEmpty(item.CURRENTACTIVEMENU)) - { - menuItem.meta.currentActiveMenu = item.CURRENTACTIVEMENU; - } - if (!string.IsNullOrEmpty(item.SHOW)) - { - menuItem.meta.hideMenu = item.SHOW == "1" ? true : false; - menuItem.meta.showMenu = item.SHOW == "0" ? true : false; - } - if (!string.IsNullOrEmpty(item.IGNOREAUTH)) - { - menuItem.meta.ignoreAuth = item.IGNOREAUTH == "Y"; - } - menuItem.keepalive = item.IGNOREKEEPALIVE; - menuItem.show = item.SHOW; - menuItem.menuName = item.FUNC_NAME; - menuItem.createTime = item.CREATE_TIME; - menuItem.status = item.IS_USE; - menuItem.icon = menuItem.meta.icon; - menuItem.func_type = item.FUNC_TYPE; - menuItem.btnType = item.BUTTON_TYPE; - menuItem.doMethod = item.DO_METHOD; - menuItem.parentMenu = item.PFUNC_CODE; - menuItem.orderNo = item.SEQ_NO; - menuItem.children = null; - GetMenuItem(items, item.FUNC_CODE, ref menuItem); - data.Add(menuItem); - } + }; //杞崲Json鏃讹紝鍘婚櫎鍊间负null鐨勫睘鎬� var jsonSetting = new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore }; -- Gitblit v1.9.3