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

😎同步开源代码仓库

Browse Source
This commit is contained in:
zuohuaijun 2024-11-25 16:35:31 +08:00
parent 369bb601b5
commit 6e9a8c7778
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs
View File

@ -43,7 +43,8 @@ public class SysMenuService : IDynamicApiController, ITransient
{ {
var menuList = await _sysMenuRep.AsQueryable() var menuList = await _sysMenuRep.AsQueryable()
.Where(u => u.Type != MenuTypeEnum.Btn && u.Status == StatusEnum.Enable) .Where(u => u.Type != MenuTypeEnum.Btn && u.Status == StatusEnum.Enable)
.OrderBy(u => new { u.OrderNo, u.Id }).ToTreeAsync(u => u.Children, u => u.Pid, 0); .OrderBy(u => new { u.OrderNo, u.Id })
.Distinct().ToTreeAsync(u => u.Children, u => u.Pid, 0);
return menuList.Adapt<List<MenuOutput>>(); return menuList.Adapt<List<MenuOutput>>();
} }
else else
@ -51,7 +52,8 @@ public class SysMenuService : IDynamicApiController, ITransient
var menuIdList = await GetMenuIdList(); var menuIdList = await GetMenuIdList();
var menuTree = await _sysMenuRep.AsQueryable() var menuTree = await _sysMenuRep.AsQueryable()
.Where(u => u.Status == StatusEnum.Enable) .Where(u => u.Status == StatusEnum.Enable)
.OrderBy(u => new { u.OrderNo, u.Id }).ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray()); .OrderBy(u => new { u.OrderNo, u.Id })
.Distinct().ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray());
DeleteBtnFromMenuTree(menuTree); DeleteBtnFromMenuTree(menuTree);
return menuTree.Adapt<List<MenuOutput>>(); return menuTree.Adapt<List<MenuOutput>>();
} }
@ -89,13 +91,15 @@ public class SysMenuService : IDynamicApiController, ITransient
.WhereIF(!string.IsNullOrWhiteSpace(input.Title), u => u.Title.Contains(input.Title)) .WhereIF(!string.IsNullOrWhiteSpace(input.Title), u => u.Title.Contains(input.Title))
.WhereIF(input.Type is > 0, u => u.Type == input.Type) .WhereIF(input.Type is > 0, u => u.Type == input.Type)
.WhereIF(menuIdList.Count > 1, u => menuIdList.Contains(u.Id)) .WhereIF(menuIdList.Count > 1, u => menuIdList.Contains(u.Id))
.OrderBy(u => new { u.OrderNo, u.Id }).ToListAsync(); .OrderBy(u => new { u.OrderNo, u.Id })
.Distinct().ToListAsync();
} }
return _userManager.SuperAdmin ? return _userManager.SuperAdmin ?
await _sysMenuRep.AsQueryable().OrderBy(u => new { u.OrderNo, u.Id }).ToTreeAsync(u => u.Children, u => u.Pid, 0) : await _sysMenuRep.AsQueryable().OrderBy(u => new { u.OrderNo, u.Id })
await _sysMenuRep.AsQueryable() .Distinct().Distinct().ToTreeAsync(u => u.Children, u => u.Pid, 0) :
.OrderBy(u => new { u.OrderNo, u.Id }).ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray()); // 角色菜单授权时 await _sysMenuRep.AsQueryable().OrderBy(u => new { u.OrderNo, u.Id })
.Distinct().ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray());
} }
/// <summary> /// <summary>

2
Web/src/utils/exportExcel.ts
View File

@ -69,7 +69,7 @@ export function exportExcel(jsonarr: Array<EmptyObjectType>, name: string, heade
for (let i = 0; i < headerArr.length; i++) { for (let i = 0; i < headerArr.length; i++) {
let row = headerArr[i]; let row = headerArr[i];
for (let j = 0; j < row.length; j++) { for (let j = 0; j < row.length; j++) {
if (headerArr[i][j] == null) { if (headerArr[i][j] == null && i > 0) {
headerArr[i][j] = headerArr[i - 1][j]; headerArr[i][j] = headerArr[i - 1][j];
} }
} }