gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎优化默认租户菜单列表

Browse Source
This commit is contained in:
zuohuaijun 2025-03-21 02:19:20 +08:00
parent 305690f32c
commit 1b6d8e01ea
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs
View File

@ -17,6 +17,7 @@ public class SysTenantService : IDynamicApiController, ITransient
private readonly SqlSugarRepository<SysRole> _sysRoleRep; private readonly SqlSugarRepository<SysRole> _sysRoleRep;
private readonly SqlSugarRepository<SysPos> _sysPosRep; private readonly SqlSugarRepository<SysPos> _sysPosRep;
private readonly SqlSugarRepository<SysUser> _sysUserRep; private readonly SqlSugarRepository<SysUser> _sysUserRep;
private readonly SqlSugarRepository<SysMenu> _sysMenuRep;
private readonly SqlSugarRepository<SysUserExtOrg> _sysUserExtOrgRep; private readonly SqlSugarRepository<SysUserExtOrg> _sysUserExtOrgRep;
private readonly SqlSugarRepository<SysRoleMenu> _sysRoleMenuRep; private readonly SqlSugarRepository<SysRoleMenu> _sysRoleMenuRep;
private readonly SqlSugarRepository<SysUserRole> _userRoleRep; private readonly SqlSugarRepository<SysUserRole> _userRoleRep;
@ -33,6 +34,7 @@ public class SysTenantService : IDynamicApiController, ITransient
SqlSugarRepository<SysRole> sysRoleRep, SqlSugarRepository<SysRole> sysRoleRep,
SqlSugarRepository<SysPos> sysPosRep, SqlSugarRepository<SysPos> sysPosRep,
SqlSugarRepository<SysUser> sysUserRep, SqlSugarRepository<SysUser> sysUserRep,
SqlSugarRepository<SysMenu> sysMenuRep,
SqlSugarRepository<SysUserExtOrg> sysUserExtOrgRep, SqlSugarRepository<SysUserExtOrg> sysUserExtOrgRep,
SqlSugarRepository<SysRoleMenu> sysRoleMenuRep, SqlSugarRepository<SysRoleMenu> sysRoleMenuRep,
SqlSugarRepository<SysUserRole> userRoleRep, SqlSugarRepository<SysUserRole> userRoleRep,
@ -49,6 +51,7 @@ public class SysTenantService : IDynamicApiController, ITransient
_sysRoleRep = sysRoleRep; _sysRoleRep = sysRoleRep;
_sysPosRep = sysPosRep; _sysPosRep = sysPosRep;
_sysUserRep = sysUserRep; _sysUserRep = sysUserRep;
_sysMenuRep = sysMenuRep;
_sysUserExtOrgRep = sysUserExtOrgRep; _sysUserExtOrgRep = sysUserExtOrgRep;
_sysRoleMenuRep = sysRoleMenuRep; _sysRoleMenuRep = sysRoleMenuRep;
_userRoleRep = userRoleRep; _userRoleRep = userRoleRep;
@ -255,16 +258,10 @@ public class SysTenantService : IDynamicApiController, ITransient
// 关联租户组织机构和管理员用户 // 关联租户组织机构和管理员用户
await _sysTenantRep.UpdateAsync(u => new SysTenant() { UserId = newUser.Id, OrgId = newOrg.Id }, u => u.Id == tenantId); await _sysTenantRep.UpdateAsync(u => new SysTenant() { UserId = newUser.Id, OrgId = newOrg.Id }, u => u.Id == tenantId);
// 默认租户管理员角色菜单集合 // 默认租户管理员角色菜单集合（工作台、账号管理、角色管理、机构管理、职位管理、个人中心、通知公告）
var menuIdList = new List<long> { 1300000000111,1300000000121, // 工作台 var menuPidList = new List<long> { 1300000000101, 1310000000111, 1310000000131, 1310000000141, 1310000000151, 1310000000161, 1310000000171 };
1310000000111,1310000000112,1310000000113,1310000000114,1310000000115,1310000000116,1310000000117,1310000000118,1310000000119,1310000000120,1310000000121, // 账号 var menuIdList = await _sysMenuRep.AsQueryable().ClearFilter()
1310000000131,1310000000132,1310000000133,1310000000134,1310000000135,1310000000136,1310000000137,1310000000138, // 角色 .Where(u => menuPidList.Contains(u.Id) || menuPidList.Contains(u.Pid)).Select(u => u.Id).ToListAsync();
1310000000141,1310000000142,1310000000143,1310000000144,1310000000145, // 机构
1310000000151,1310000000152,1310000000153,1310000000154,1310000000155,1310000000156, // 职位
1310000000161,1310000000162,1310000000163,1310000000164,1310000000165, // 个人中心
1310000000171,1310000000172,1310000000173,1310000000174,1310000000175,1310000000176, // 通知公告
1310000000801 // 关于项目
};
await _sysRoleMenuService.GrantRoleMenu(new RoleMenuInput() { Id = newRole.Id, MenuIdList = menuIdList }); await _sysRoleMenuService.GrantRoleMenu(new RoleMenuInput() { Id = newRole.Id, MenuIdList = menuIdList });
// 发布新增租户事件 // 发布新增租户事件
@ -657,9 +654,12 @@ public class SysTenantService : IDynamicApiController, ITransient
// 保存图标配置 // 保存图标配置
tenant.Logo = $"/{path}/{fileName}"; tenant.Logo = $"/{path}/{fileName}";
} }
else
{
tenant.Logo = tenant.Logo;
}
await _sysTenantRep.AsUpdateable(tenant) await _sysTenantRep.AsUpdateable(tenant).UpdateColumns(u => new
.UpdateColumns(u => new
{ {
u.Logo, u.Logo,
u.Title, u.Title,
@ -675,8 +675,7 @@ public class SysTenantService : IDynamicApiController, ITransient
u.Animation, u.Animation,
u.Captcha, u.Captcha,
u.SecondVer u.SecondVer
}) }).ExecuteCommandAsync();
.ExecuteCommandAsync();
} }
/// <summary> /// <summary>