From f4e01fb44b5428e61780e63d272df1d03f7281f3 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期六, 28 十二月 2024 13:49:32 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/PermissionDataHostService.cs | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/PermissionDataHostService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/PermissionDataHostService.cs"
index f583a3a..1656f81 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/PermissionDataHostService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/PermissionDataHostService.cs"
@@ -30,7 +30,21 @@
public Task StartAsync(CancellationToken cancellationToken)
{
- List<ExpandoObject> roles = _dbContext.Db.Queryable("Sys_Role", "x").Select(RoleSelectModes).ToList();
+ List<UserRole> userRoles = GetUserRoles(_dbContext.Db);
+ UserRoles = userRoles;
+ _cacheService.AddOrUpdate("UserRoles", userRoles.Serialize());
+
+ return Task.CompletedTask;
+ }
+
+ public Task StopAsync(CancellationToken cancellationToken)
+ {
+ throw new NotImplementedException();
+ }
+
+ public static List<UserRole> GetUserRoles(ISqlSugarClient db)
+ {
+ List<ExpandoObject> roles = db.Queryable("Sys_Role", "x").Select(RoleSelectModes).ToList();
List<dynamic> roleDynamics = new List<dynamic>();
foreach (var item in roles)
{
@@ -38,13 +52,13 @@
}
List<dynamic> roleDataDynamics = new List<dynamic>();
- List<ExpandoObject> roleDatas = _dbContext.Db.Queryable("Sys_RoleDataPermission", "x").Select(RoleDataSelectModes).ToList();
+ List<ExpandoObject> roleDatas = db.Queryable("Sys_RoleDataPermission", "x").Select(RoleDataSelectModes).ToList();
foreach (var item in roleDatas)
{
roleDataDynamics.Add(item);
}
- List<ExpandoObject> users = _dbContext.Db.Queryable("Sys_User", "x").Select(UserSelectModes).ToList();
+ List<ExpandoObject> users = db.Queryable("Sys_User", "x").Select(UserSelectModes).ToList();
List<UserRole> userRoles = new List<UserRole>();
foreach (var item in users)
@@ -61,7 +75,6 @@
{
userRoles.Add(new UserRole
{
- AuthorityScope = role.AuthorityScope,
RoleId = role.RoleId,
RoleName = role.RoleName,
ParentId = role.ParentId,
@@ -71,19 +84,10 @@
});
}
}
-
- UserRoles = userRoles;
- _cacheService.AddOrUpdate("UserRoles", userRoles.Serialize());
-
- return Task.CompletedTask;
+ return userRoles;
}
- public Task StopAsync(CancellationToken cancellationToken)
- {
- throw new NotImplementedException();
- }
-
- List<SelectModel> RoleSelectModes = new List<SelectModel>()
+ static List<SelectModel> RoleSelectModes = new List<SelectModel>()
{
new SelectModel()
{
@@ -97,13 +101,9 @@
{
FieldName = "RoleName",
},
- new SelectModel()
- {
- FieldName = "AuthorityScope",
- }
};
- List<SelectModel> UserSelectModes = new List<SelectModel>()
+ static List<SelectModel> UserSelectModes = new List<SelectModel>()
{
new SelectModel()
{
@@ -123,7 +123,7 @@
}
};
- List<SelectModel> RoleDataSelectModes = new List<SelectModel>()
+ static List<SelectModel> RoleDataSelectModes = new List<SelectModel>()
{
new SelectModel()
{
--
Gitblit v1.9.3