From 457b75b642a1fdaa7158e5b047cabc5d7ae16333 Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期一, 10 三月 2025 10:10:13 +0800
Subject: [PATCH] 修复和优化 Dt_TaskService.cs 中的任务请求逻辑
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_MenuService.cs | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_MenuService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_MenuService.cs
index 11a40cf..6265c26 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_MenuService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Services/Sys_MenuService.cs
@@ -47,6 +47,23 @@
return obj;
}
+ public object GetCurrentMenuPhoneActionList()
+ {
+ object obj = GetMenuActionPhoneList(App.User.RoleId);
+ if (obj is IEnumerable<object> list)
+ {
+ if (list.Any())
+ {
+ return obj;
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("鏈幏鍙栧埌鑿滃崟淇℃伅");
+ }
+ }
+ return obj;
+ }
+
/// <summary>
/// 鏍规嵁瑙掕壊ID鑾峰彇鑿滃崟涓庢潈闄�
/// </summary>
@@ -54,13 +71,26 @@
/// <returns></returns>
public object GetMenuActionList(int roleId)
{
- if (App.User.IsRoleIdSuperAdmin(roleId))
- {
- return BaseDal.GetSuperAdminMenu();
- }
return BaseDal.GetMenuByRoleId(roleId);
}
+ /// <summary>
+ /// 鏍规嵁瑙掕壊ID鑾峰彇鑿滃崟涓庢潈闄�
+ /// </summary>
+ /// <param name="roleId"></param>
+ /// <returns></returns>
+ public object GetMenuActionPhoneList(int roleId)
+ {
+ var allMenu = BaseDal.QueryData(x => (x.Enable == 1 || x.Enable == 2) && x.MenuType == 1 && x.ParentId > 0).OrderByDescending(a => a.OrderNo).ThenByDescending(q => q.ParentId).ToList();
+
+ var menu = allMenu.Select(x => new
+ {
+ text = x.MenuName,
+ url = x.Url,
+ icon = x.Icon,
+ });
+ return menu.ToList();
+ }
public List<MenuDTO> GetUserMenuList(int roleId)
{
@@ -155,7 +185,7 @@
if (menu.MenuId == menu.ParentId)
{
return webResponse.Error($"鐖剁骇id涓嶈兘涓鸿嚜宸�");
- }
+ }
if (BaseDal.QueryFirst(x => x.ParentId == menu.MenuId && menu.ParentId == x.MenuId) != null)
{
return webResponse.Error($"涓嶈兘閫夋嫨姝ょ埗绾d锛岄�夋嫨鐨勭埗绾d涓庡綋鍓嶈彍鍗曞舰鎴愪緷璧栧叧绯�");
@@ -172,7 +202,6 @@
webResponse.Error(ex.Message);
}
return webResponse;
-
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3