From 092971a8ba7848f024427694c642959d0fbc8599 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 08 五月 2025 15:56:09 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
index 9cec77d..4822cca 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
@@ -22,39 +22,41 @@
{
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly ICacheService _cacheService;
+ private readonly ISys_MenuService _menuService;
private readonly ISys_RoleService _sys_RoleService;
- public Sys_UserService(ISys_UserRepository repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_RoleService sys_RoleService) : base(repository)
+ public Sys_UserService(ISys_UserRepository repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_RoleService sys_RoleService, ISys_MenuService menuService) : base(repository)
{
_unitOfWorkManage = unitOfWorkManage;
_cacheService = cacheService;
_sys_RoleService = sys_RoleService;
+ _menuService = menuService;
}
- public override PageGridData<Sys_User> GetPageData(PageDataOptions options)
- {
- var roleIds = _sys_RoleService.GetAllChildren(App.User.RoleId).Select(x => x.Id);
- PageGridData<Sys_User> pageGridData = new PageGridData<Sys_User>();
- //鏍戝舰鑿滃崟浼犳煡璇㈣鑹蹭笅鎵�鏈夌敤鎴�
- if (App.User.IsSuperAdmin)
- {
- var GridData = base.GetPageData(options);
- pageGridData = new PageGridData<Sys_User>()
- {
- Rows = options.Order?.ToLower() == "asc" ? GridData.Rows.OrderBy(x => x.Role_Id).ToList() : GridData.Rows,
- Total = GridData.Total
- };
- return pageGridData;
- }
- string where = ValidatePageOptions(options);
- var a = BaseDal.Db.Queryable<Sys_User>().Where(x => roleIds.Contains(x.Role_Id)).Where(where);
- int total = 0;
- pageGridData = new PageGridData<Sys_User>()
- {
- Rows = BaseDal.Db.Queryable<Sys_User>().Where(x => roleIds.Contains(x.Role_Id)).Where(where).ToPageList(options.Page, options.Rows),
- Total = total
- };
+ //public override PageGridData<Sys_User> GetPageData(PageDataOptions options)
+ //{
+ // var roleIds = _sys_RoleService.GetAllChildren(App.User.RoleId).Select(x => x.Id);
+ // PageGridData<Sys_User> pageGridData = new PageGridData<Sys_User>();
+ // //鏍戝舰鑿滃崟浼犳煡璇㈣鑹蹭笅鎵�鏈夌敤鎴�
+ // if (App.User.IsSuperAdmin)
+ // {
+ // var GridData = base.GetPageData(options);
+ // pageGridData = new PageGridData<Sys_User>()
+ // {
+ // Rows = options.Order?.ToLower() == "asc" ? GridData.Rows.OrderBy(x => x.Role_Id).ToList() : GridData.Rows,
+ // Total = GridData.Total
+ // };
+ // return pageGridData;
+ // }
+ // string where = ValidatePageOptions(options);
+ // var a = BaseDal.Db.Queryable<Sys_User>().Where(x => roleIds.Contains(x.Role_Id)).Where(where);
+ // int total = 0;
+ // pageGridData = new PageGridData<Sys_User>()
+ // {
+ // Rows = BaseDal.Db.Queryable<Sys_User>().Where(x => roleIds.Contains(x.Role_Id)).Where(where).ToPageList(options.Page, options.Rows),
+ // Total = total
+ // };
- return pageGridData;
- }
+ // return pageGridData;
+ //}
public WebResponseContent Login(LoginInfo loginInfo)
{
WebResponseContent content = new WebResponseContent();
@@ -78,6 +80,7 @@
UserInfo user = BaseDal.GetUserInfo(loginInfo.UserName, loginInfo.Password);
if (user != null)
{
+ object obj = _menuService.GetMenuActionList(user.RoleId);
#region 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鍚敤
if (BaseDal.QueryFirst(x => x.User_Id == user.UserId, s => s.Enable) != 1) throw new Exception($"璐﹀彿{user.UserName}绂佹浣跨敤,璇疯仈绯荤鐞嗗憳");
#endregion
--
Gitblit v1.9.3