From 92b129a783ff748a4e5365803aa862888fa4470e Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 16 一月 2024 14:27:10 +0800
Subject: [PATCH] WMS
---
代码管理/WMS/WMS_Server/WIDESEA_Core/Infrastructure/DictionaryHandler.cs | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Core/Infrastructure/DictionaryHandler.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Core/Infrastructure/DictionaryHandler.cs"
index fa5dc69..b4c97f2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Core/Infrastructure/DictionaryHandler.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Core/Infrastructure/DictionaryHandler.cs"
@@ -24,19 +24,36 @@
switch (dicNo)
{
case "roles":
+ originalSql = GetRolesSql(originalSql);
+ break;
//2020.05.24澧炲姞缁戝畾table琛ㄦ椂锛岃幏鍙栨墍鏈夌殑瑙掕壊鍒楄〃
//娉ㄦ剰锛屽鏋滄槸2020.05.24涔嬪墠鑾峰彇鐨勬暟鎹簱鑴氭湰
//璇峰湪鑿滃崟銆愪笅鎷夋缁戝畾璁剧疆銆戞坊鍔犱竴涓瓧鍏哥紪鍙枫�恡_roles銆�,闄や簡瀛楀吀缂栧彿锛屽叾浠栧唴瀹归殢渚垮～鍐�
case "t_roles":
+ originalSql = GetRolesSql();
+ break;
case "tree_roles":
- originalSql = GetRolesSql(originalSql);
break;
default:
break;
}
return originalSql;
}
-
+ /// <summary>
+ /// 2020.05.24澧炲姞缁戝畾table琛ㄦ椂锛岃幏鍙栨墍鏈夌殑瑙掕壊鍒楄〃
+ /// </summary>
+ /// <param name="context"></param>
+ /// <param name="originalSql"></param>
+ /// <returns></returns>
+ public static string GetRolesSql()
+ {
+ if (DBType.Name == DbCurrentType.PgSql.ToString())
+ {
+ return "SELECT \"Role_Id\" as key,\"RoleName\" as value from Sys_Role";
+ }
+ return $@"SELECT Role_Id as 'key',RoleName as 'value' FROM Sys_Role
+ WHERE Enable=1 ";
+ }
/// <summary>
/// 鑾峰彇瑙ｅ喅鐨勬暟鎹簮锛屽彧鑳界湅鍒拌嚜宸变笌涓嬬骇鎵�鏈夎鑹�
/// </summary>
@@ -45,7 +62,7 @@
/// <returns></returns>
public static string GetRolesSql(string originalSql)
{
-
+
if (UserContext.Current.IsSuperAdmin)
{
return originalSql;
@@ -54,15 +71,17 @@
int currnetRoleId = UserContext.Current.RoleId;
List<int> roleIds = RoleContext.GetAllChildrenIds(currnetRoleId);
roleIds.Add(currnetRoleId);
- if (DBType.Name == DbCurrentType.PgSql.ToString())
- {
- originalSql = $"SELECT \"Role_Id\" as key,\"Role_Id\" as id,\"RoleName\" as value,\"ParentId\" AS parentId from Sys_Role"
- +$" where \"Role_Id\" in ({string.Join(',', roleIds)})";
- }
- else {
- originalSql= $@"SELECT Role_Id as 'key',Role_Id AS id,ParentId AS parentId,RoleName as 'value' FROM Sys_Role
- WHERE Enable=1 and Role_Id in ({string.Join(',', roleIds)})";
- }
+ //if (DBType.Name == DbCurrentType.PgSql.ToString())
+ //{
+ // originalSql = $"SELECT \"Role_Id\" as key,\"Role_Id\" as id,\"RoleName\" as value,\"ParentId\" AS parentId from Sys_Role"
+ // +$" where \"Role_Id\" in ({string.Join(',', roleIds)})";
+ //}
+ //else {
+ // originalSql= $@"SELECT Role_Id as 'key',Role_Id AS id,ParentId AS parentId,RoleName as 'value' FROM Sys_Role
+ // WHERE Enable=1 and Role_Id in ({string.Join(',', roleIds)})";
+ //}
+ originalSql = $@"SELECT Role_Id as 'key',RoleName as 'value' FROM Sys_Role
+ WHERE Enable=1 and Role_Id in ({string.Join(',', roleIds)})";
return originalSql;
}
}
--
Gitblit v1.9.3