From 8bfaf7141c88f41d3dbd1995cfb9cb015ca0d1d6 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 02 八月 2024 16:34:13 +0800
Subject: [PATCH] 整理了工序传入传出参数
---
Tiger.Business/SYS/Biz.SYS_MENU.cs | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/Tiger.Business/SYS/Biz.SYS_MENU.cs b/Tiger.Business/SYS/Biz.SYS_MENU.cs
index b6a5b83..96cb053 100644
--- a/Tiger.Business/SYS/Biz.SYS_MENU.cs
+++ b/Tiger.Business/SYS/Biz.SYS_MENU.cs
@@ -121,16 +121,15 @@
SYS_MENU func = null;
if (!string.IsNullOrEmpty(menuName))
{
- func = Biz.Db.Queryable<SYS_MENU>().Where(x=>x.FUNC_NAME == menuName).First();
+ func = Biz.Db.Queryable<SYS_MENU>().Where(x => x.FUNC_NAME == menuName).First();
}
- var items = await Biz.Db.Queryable<SYS_MENU>()
- .WhereIF(!string.IsNullOrEmpty(status),q=>q.IS_USE == status)
- .OrderBy(x => x.SEQ_NO)
- .Distinct().ToListAsync();
- //娌℃湁鏌ヨ鐨勬椂鍊�
- if (func == null)
+ if (func != null)
{
- List<SYS_MENU> entities = items.OrderBy(x => x.SEQ_NO).ToList().FindAll(t => t.PFUNC_CODE == "0");
+ 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 menuItem = new();
@@ -174,19 +173,15 @@
menuItem.btnType = item.BUTTON_TYPE;
menuItem.doMethod = item.DO_METHOD;
menuItem.parentMenu = item.PFUNC_CODE;
- menuItem.orderNo= item.SEQ_NO;
- menuItem.children = new();
+ menuItem.orderNo = item.SEQ_NO;
+ menuItem.children = null;
GetMenuItem(items, item.FUNC_CODE, ref menuItem);
data.Add(menuItem);
}
- }
- //鏈夋煡璇㈡潯浠剁殑鏃跺��
- else {
-
- }
+ };
//杞崲Json鏃讹紝鍘婚櫎鍊间负null鐨勫睘鎬�
- var jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
+ var jsonSetting = new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore };
var json = JsonConvert.SerializeObject(data, Formatting.Indented, jsonSetting);
return json;
}
@@ -325,7 +320,7 @@
menuItem.keepalive = item.IGNOREKEEPALIVE;
menuItem.show = item.SHOW;
menuItem.menuName = item.FUNC_NAME;
- menuItem.createTime = item.CREATE_TIME;
+ menuItem.createTime = item.CREATE_TIME;
menuItem.icon = menuItem.meta.icon;
menuItem.func_type = item.FUNC_TYPE;
menuItem.btnType = item.BUTTON_TYPE;
@@ -333,8 +328,9 @@
menuItem.parentMenu = item.PFUNC_CODE;
menuItem.orderNo = item.SEQ_NO;
menuItem.status = item.IS_USE;
- menuItem.children = new();
+ menuItem.children = null;
GetMenuItem(data, item.FUNC_CODE, ref menuItem);
+ if (pMenuItem.children == null) { pMenuItem.children = new(); }
pMenuItem.children.Add(menuItem);
}
}
--
Gitblit v1.9.3