ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Browse Source
This commit is contained in:
Xy
2021-04-23 10:56:40 +00:00
parent 02b5311f9a
commit 9398e6cf7a
17 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Api/Dilon.Core/Service/App/Dto/AppInput.cs
View File

@@ -31,7 +31,7 @@ namespace Dilon.Core.Service
/// 是否默认激活（Y-是，N-否）,只能有一个系统默认激活
/// 用户登录后默认展示此系统菜单
/// </summary>
public string Active { get; set; }
public bool Active { get; set; }
/// <summary>
/// 状态（字典 0正常 1停用 2删除）
@@ -76,7 +76,7 @@ namespace Dilon.Core.Service
/// 应用Id
/// </summary>
[Required(ErrorMessage = "应用Id不能为空")]
public long Id { get; set; }
public string Id { get; set; }
}
public class UpdateAppInput : AppInput
@@ -85,7 +85,7 @@ namespace Dilon.Core.Service
/// 应用Id
/// </summary>
[Required(ErrorMessage = "应用Id不能为空")]
public long Id { get; set; }
public string Id { get; set; }
}
public class QueryAppInput : DeleteAppInput

4
Api/Dilon.Core/Service/App/Dto/AppOutput.cs
View File

@@ -8,7 +8,7 @@
/// <summary>
/// 应用Id
/// </summary>
public long Id { get; set; }
public string Id { get; set; }
/// <summary>
/// 名称
@@ -23,7 +23,7 @@
/// <summary>
/// 是否默认
/// </summary>
public string Active { get; set; }
public bool Active { get; set; }
/// <summary>
/// 排序

2
Api/Dilon.Core/Service/App/ISysAppService.cs
View File

@@ -9,7 +9,7 @@ namespace Dilon.Core.Service
Task DeleteApp(DeleteAppInput input);
Task<SysApp> GetApp([FromQuery] QueryAppInput input);
Task<dynamic> GetAppList([FromQuery] AppInput input);
Task<dynamic> GetLoginApps(long userId);
Task<dynamic> GetLoginApps(string userId);
Task<dynamic> QueryAppPageList([FromQuery] AppInput input);
Task SetAsDefault(SetDefaultAppInput input);
Task UpdateApp(UpdateAppInput input);

10
Api/Dilon.Core/Service/App/SysAppService.cs
View File

@@ -38,7 +38,7 @@ namespace Dilon.Core.Service
/// <param name="userId"></param>
/// <returns></returns>
[NonAction]
public async Task<dynamic> GetLoginApps(long userId)
public async Task<dynamic> GetLoginApps(string userId)
{
var apps = _sysAppRep.DetachedEntities.Where(u => u.Status == (int)CommonStatus.ENABLE);
if (!_userManager.SuperAdmin)
@@ -89,7 +89,7 @@ namespace Dilon.Core.Service
if (isExist)
throw Oops.Oh(ErrorCode.D5000);
if (input.Active == YesOrNot.Y.ToString())
if (input.Active)
{
isExist = await _sysAppRep.DetachedEntities.AnyAsync(u => u.Active == input.Active);
if (isExist)
@@ -129,7 +129,7 @@ namespace Dilon.Core.Service
if (isExist)
throw Oops.Oh(ErrorCode.D5000);
if (input.Active == YesOrNot.Y.ToString())
if (input.Active)
{
isExist = await _sysAppRep.DetachedEntities.AnyAsync(u => u.Active == input.Active);
if (isExist)
@@ -173,11 +173,11 @@ namespace Dilon.Core.Service
var apps = await _sysAppRep.Where(u => u.Status == (int)CommonStatus.ENABLE).ToListAsync();
apps.ForEach(u =>
{
u.Active = YesOrNot.N.ToString();
u.Active = false;
});
var app = await _sysAppRep.FirstOrDefaultAsync(u => u.Id == input.Id);
app.Active = YesOrNot.Y.ToString();
app.Active = true;
}
/// <summary>