yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 代码合并,minio上传文件

Browse Source
This commit is contained in:
liguoyang
2024-01-26 18:22:57 +08:00
parent f83afdb4d0
commit 05c2073ea7
57 changed files with 637 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Src/Dlhis.Sys/Menu/Services/Implements/MenuService.cs
View File

@@ -1,8 +1,8 @@
using Dlhis.Entity.Sys.Entities;
using Dlhis.Entity.Sys.Enums;
using Dlhis.Sys.Identity.Services;
using Dlhis.Sys.Menu.Request;
using Dlhis.Sys.Menu.Response;
using Dlhis.User.Api;
using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.Result;
using Kurisu.Core.User.Abstractions;
@@ -16,13 +16,13 @@ public class MenuService : IMenuService
{
private readonly IDbContext _dbContext;
private readonly ICurrentUser _currentUser;
private readonly IUserApi _userApi;
private readonly IUserService _userService;
public MenuService(IDbContext dbContext, ICurrentUser currentUser, IUserApi userApi)
public MenuService(IDbContext dbContext, ICurrentUser currentUser, IUserService userService)
{
_dbContext = dbContext;
_currentUser = currentUser;
_userApi = userApi;
_userService = userService;
}
public async Task<List<MenuResponse>> GetListAsync(PlatformEnumType platform)
@@ -270,9 +270,7 @@ public class MenuService : IMenuService
private async Task<List<string>> GetAllAssignmentCodesAsync()
{
var userApiResult = await _userApi.GetUserByIdAsync(_currentUser.GetIntSubjectId());
(userApiResult.Code == ApiStateCode.Success).ThrowIfFalse(userApiResult.Msg);
var user = userApiResult.Data;
var user = await _userService.GetUserByIdAsync(_currentUser.GetIntSubjectId());
// var groupCodes = await GetAssignmentCodesAsync(MenuPermissionTypeEnumType.Group, manager.usergrp);