From 99df058a665ea04065a23e729ec79a2f23f79881 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 20 五月 2025 16:59:43 +0800
Subject: [PATCH] 优化
---
HMI.Base/PluginLoader.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/HMI.Base/PluginLoader.cs b/HMI.Base/PluginLoader.cs
index ae11ccb..e63503a 100644
--- a/HMI.Base/PluginLoader.cs
+++ b/HMI.Base/PluginLoader.cs
@@ -62,6 +62,7 @@
}
private IPluginContainer pluginContainer;
+
public void LoadMenuAndPlugin(IPluginContainer container, Dispatcher dispatcher)
{
pluginContainer = container;
@@ -76,6 +77,7 @@
});
}
}
+
private void LoadChildrenMenu()
{
foreach (var menu in Plugins)
@@ -139,7 +141,7 @@
}
catch (Exception ex)
{
- log.Error("Load Plugin Failed.", ex);
+ log.Error($"Load Plugin [{menu.Name}] Failed.", ex);
LoadMessageAppend?.Invoke(this, new LoadMsg
{
Type = LoadMsgType.LOADING,
@@ -164,10 +166,10 @@
try
{
UserInfo user = UserInfo.User;
- string sql = $@"SELECT m.* FROM menu AS m INNER JOIN role_menu_rel AS rrel ON m.code = rrel.menuCode
+ string sql = $@"SELECT DISTINCT m.* FROM menu AS m INNER JOIN role_menu_rel AS rrel ON m.code = rrel.menuCode
INNER JOIN role AS r ON rrel.roleCode = r.code
INNER JOIN user_role_rel AS urel ON r.code = urel.roleCode
-AND urel.username = '{user.Username}' ORDER BY m.level, m.id;";
+AND urel.username = '{user.Username}' ORDER BY m.level,m.sort, m.id;";
DataTable dt = sqliteHelper.GetDataTable(sql);
if (dt != null)
@@ -217,6 +219,5 @@
}
return data;
}
-
}
}
--
Gitblit v1.9.1