From 97b9f7d9650b426fa540e7aaba7739a2e7080ab0 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期六, 11 一月 2025 10:55:13 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/PermissionDataHostService.cs | 45 +++++++++++++++++++++++++++++++++++++++++++++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs | 3 +++
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3ba3019c-440c-48eb-82b3-06cc25ec7301.vsidx | 0
3 files changed, 48 insertions(+), 0 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3ba3019c-440c-48eb-82b3-06cc25ec7301.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3ba3019c-440c-48eb-82b3-06cc25ec7301.vsidx"
new file mode 100644
index 0000000..249ddd8
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3ba3019c-440c-48eb-82b3-06cc25ec7301.vsidx"
Binary files differ
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 1656f81..0ff7fb6 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"
@@ -87,6 +87,51 @@
return userRoles;
}
+ public static List<UserRole> GetUserRoles(ISqlSugarClient db, int userId)
+ {
+ List<ExpandoObject> roles = db.Queryable("Sys_Role", "x").Select(RoleSelectModes).ToList();
+ List<dynamic> roleDynamics = new List<dynamic>();
+ foreach (var item in roles)
+ {
+ roleDynamics.Add(item);
+ }
+
+ List<dynamic> roleDataDynamics = new List<dynamic>();
+ List<ExpandoObject> roleDatas = db.Queryable("Sys_RoleDataPermission", "x").Select(RoleDataSelectModes).ToList();
+ foreach (var item in roleDatas)
+ {
+ roleDataDynamics.Add(item);
+ }
+
+ List<ExpandoObject> users = db.Queryable("Sys_User", "x").Where($"UserId={userId}").Select(UserSelectModes).ToList();
+
+ List<UserRole> userRoles = new List<UserRole>();
+ foreach (var item in users)
+ {
+ dynamic user = item;
+ dynamic? role = roleDynamics.FirstOrDefault(x => x.RoleId == user.RoleId);
+ List<object> warehouseIds = roleDataDynamics.Where(x => x.RoleId == user.RoleId).Select(x => x.WarehouseId).ToList();
+ List<int> ids = new List<int>();
+ for (int i = 0; i < warehouseIds.Count; i++)
+ {
+ ids.Add(Convert.ToInt32(warehouseIds[i]));
+ }
+ if (role != null)
+ {
+ userRoles.Add(new UserRole
+ {
+ RoleId = role.RoleId,
+ RoleName = role.RoleName,
+ ParentId = role.ParentId,
+ UserId = user.UserId,
+ UserName = user.UserName,
+ WarehouseIds = ids
+ });
+ }
+ }
+ return userRoles;
+ }
+
static List<SelectModel> RoleSelectModes = new List<SelectModel>()
{
new SelectModel()
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
index fdc0cb9..414f91a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
@@ -19,6 +19,7 @@
using MailKit.Search;
using OrderByType = SqlSugar.OrderByType;
using System.Drawing.Printing;
+using WIDESEA_Core.HostedService;
namespace WIDESEA_SystemService
{
@@ -81,6 +82,8 @@
});
_cacheService.AddOrUpdate(user.UserId.ToString(), token);
+ if (PermissionDataHostService.UserRoles.FirstOrDefault(x => x.UserId == user.UserId) == null)
+ PermissionDataHostService.UserRoles.AddRange(PermissionDataHostService.GetUserRoles(Db, user.UserId));
content = WebResponseContent.Instance.OK(data: new { token, userName = user.UserName, img = user.HeadImageUrl, user.UserTrueName });
}
--
Gitblit v1.9.3