From eee43c4cb7f9018688cd6da6a3611512f3e5c5c3 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期六, 28 十二月 2024 09:18:06 +0800
Subject: [PATCH] 1

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/PermissionDataHostService.cs |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 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 95b79b2..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)
@@ -70,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()
             {
@@ -98,7 +103,7 @@
             },
         };
 
-        List<SelectModel> UserSelectModes = new List<SelectModel>()
+        static List<SelectModel> UserSelectModes = new List<SelectModel>()
         {
             new SelectModel()
             {
@@ -118,7 +123,7 @@
             }
         };
 
-        List<SelectModel> RoleDataSelectModes = new List<SelectModel>()
+        static List<SelectModel> RoleDataSelectModes = new List<SelectModel>()
         {
             new SelectModel()
             {

--
Gitblit v1.9.3