fix:完成非空问题修复

This commit is contained in:
橙子
2023-04-20 23:08:21 +08:00
parent b55a45baa2
commit c943c1fc74
68 changed files with 206 additions and 209 deletions

View File

@@ -24,7 +24,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Account
/// <summary>
/// 唯一标识码
/// </summary>
public string Uuid { get; set; }
public string? Uuid { get; set; }
/// <summary>
/// 电话
@@ -34,6 +34,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Account
/// <summary>
/// 验证码
/// </summary>
public string Code { get; set; }
public string? Code { get; set; }
}
}

View File

@@ -8,6 +8,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Account
{
public class UpdateIconDto
{
public string Icon { get; set; }
public string? Icon { get; set; }
}
}

View File

@@ -9,9 +9,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config
public string ConfigName { get; set; } = string.Empty;
public string ConfigKey { get; set; } = string.Empty;
public string ConfigValue { get; set; } = string.Empty;
public string ConfigType { get; set; }
public string? ConfigType { get; set; }
public int OrderNum { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
public DateTime CreationTime { get; set; }
}
}

View File

@@ -10,12 +10,12 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public string ConfigName { get; set; }
public string? ConfigName { get; set; }
/// <summary>
/// <20><><EFBFBD>ü<EFBFBD>
/// </summary>
public string ConfigKey { get; set; }
public string? ConfigKey { get; set; }
}
}

View File

@@ -21,7 +21,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public string ConfigType { get; set; }
public string? ConfigType { get; set; }
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD>ֶ<EFBFBD>
/// </summary>
@@ -30,7 +30,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config
/// <summary>
/// <20><>ע
/// </summary>
public string Remark { get; set; }
public string? Remark { get; set; }
/// <summary>
/// <20><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>

View File

@@ -8,9 +8,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config
public string ConfigName { get; set; } = string.Empty;
public string ConfigKey { get; set; } = string.Empty;
public string ConfigValue { get; set; } = string.Empty;
public string ConfigType { get; set; }
public string? ConfigType { get; set; }
public int OrderNum { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
public DateTime CreationTime { get; set; }
}
}

View File

@@ -6,9 +6,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Config
public string ConfigName { get; set; } = string.Empty;
public string ConfigKey { get; set; } = string.Empty;
public string ConfigValue { get; set; } = string.Empty;
public string ConfigType { get; set; }
public string? ConfigType { get; set; }
public int OrderNum { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
public DateTime CreationTime { get; set; }
}
}

View File

@@ -17,8 +17,8 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept
public bool State { get; set; }
public string DeptName { get; set; } = string.Empty;
public string DeptCode { get; set; } = string.Empty;
public string Leader { get; set; }
public string? Leader { get; set; }
public long ParentId { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

View File

@@ -6,9 +6,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept
{
public long Id { get; set; }
public bool? State { get; set; }
public string DeptName { get; set; }
public string DeptCode { get; set; }
public string Leader { get; set; }
public string? DeptName { get; set; }
public string? DeptCode { get; set; }
public string? Leader { get; set; }
}
}

View File

@@ -11,9 +11,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept
public bool State { get; set; }
public string DeptName { get; set; } = string.Empty;
public string DeptCode { get; set; } = string.Empty;
public string Leader { get; set; }
public string? Leader { get; set; }
public long ParentId { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
public int OrderNum { get; set; }
}

View File

@@ -8,8 +8,8 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept
public bool State { get; set; }
public string DeptName { get; set; } = string.Empty;
public string DeptCode { get; set; } = string.Empty;
public string Leader { get; set; }
public string Remark { get; set; }
public string? Leader { get; set; }
public string? Remark { get; set; }
public long? deptId { get; set; }

View File

@@ -14,8 +14,8 @@ namespace Yi.Furion.Core.Rbac.Dtos.Dept
public bool State { get; set; }
public string DeptName { get; set; } = string.Empty;
public string DeptCode { get; set; } = string.Empty;
public string Leader { get; set; }
public string? Leader { get; set; }
public long ParentId { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

View File

@@ -4,8 +4,8 @@ namespace Yi.Furion.Core.Rbac.Dtos.LoginLog
{
public class LoginLogGetListInputVo : PagedAllResultRequestDto
{
public string LoginUser { get; set; }
public string? LoginUser { get; set; }
public string LoginIp { get; set; }
public string? LoginIp { get; set; }
}
}

View File

@@ -7,25 +7,25 @@ namespace Yi.Furion.Core.Rbac.Dtos.LoginLog
public DateTime CreationTime { get; }
public string LoginUser { get; set; }
public string? LoginUser { get; set; }
public string LoginLocation { get; set; }
public string? LoginLocation { get; set; }
/// <summary>
/// 登录Ip
///</summary>
public string LoginIp { get; set; }
public string? LoginIp { get; set; }
/// <summary>
/// 浏览器
///</summary>
public string Browser { get; set; }
public string? Browser { get; set; }
/// <summary>
/// 操作系统
///</summary>
public string Os { get; set; }
public string? Os { get; set; }
/// <summary>
/// 登录信息
///</summary>
public string LogMsg { get; set; }
public string? LogMsg { get; set; }
public long? CreatorId { get; set; }
}

View File

@@ -14,16 +14,15 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu
public bool State { get; set; }
public string MenuName { get; set; } = string.Empty;
public MenuTypeEnum MenuType { get; set; } = MenuTypeEnum.Menu;
public string PermissionCode { get; set; }
public string? PermissionCode { get; set; }
public long ParentId { get; set; }
public string MenuIcon { get; set; }
public string Router { get; set; }
public string? MenuIcon { get; set; }
public string? Router { get; set; }
public bool IsLink { get; set; }
public bool IsCache { get; set; }
public bool IsShow { get; set; } = true;
public string Remark { get; set; }
public string Component { get; set; }
public string Query { get; set; }
public int OrderNum { get; set; }
public string? Remark { get; set; }
public string? Component { get; set; }
public string? Query { get; set; }
}
}

View File

@@ -6,7 +6,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu
{
public bool? State { get; set; }
public string MenuName { get; set; }
public string? MenuName { get; set; }
}
}

View File

@@ -12,16 +12,16 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu
public bool State { get; set; }
public string MenuName { get; set; } = string.Empty;
public MenuTypeEnum MenuType { get; set; } = MenuTypeEnum.Menu;
public string PermissionCode { get; set; }
public string? PermissionCode { get; set; }
public long ParentId { get; set; }
public string MenuIcon { get; set; }
public string Router { get; set; }
public string? MenuIcon { get; set; }
public string? Router { get; set; }
public bool IsLink { get; set; }
public bool IsCache { get; set; }
public bool IsShow { get; set; } = true;
public string Remark { get; set; }
public string Component { get; set; }
public string Query { get; set; }
public string? Remark { get; set; }
public string? Component { get; set; }
public string? Query { get; set; }
public int OrderNum { get; set; }
//public List<MenuEntity>? Children { get; set; }

View File

@@ -12,16 +12,16 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu
public bool State { get; set; }
public string MenuName { get; set; } = string.Empty;
public MenuTypeEnum MenuType { get; set; } = MenuTypeEnum.Menu;
public string PermissionCode { get; set; }
public string? PermissionCode { get; set; }
public long ParentId { get; set; }
public string MenuIcon { get; set; }
public string Router { get; set; }
public string? MenuIcon { get; set; }
public string? Router { get; set; }
public bool IsLink { get; set; }
public bool IsCache { get; set; }
public bool IsShow { get; set; } = true;
public string Remark { get; set; }
public string Component { get; set; }
public string Query { get; set; }
public string? Remark { get; set; }
public string? Component { get; set; }
public string? Query { get; set; }
public int OrderNum { get; set; }

View File

@@ -11,18 +11,16 @@ namespace Yi.Furion.Core.Rbac.Dtos.Menu
public bool State { get; set; }
public string MenuName { get; set; } = string.Empty;
public MenuTypeEnum MenuType { get; set; } = MenuTypeEnum.Menu;
public string PermissionCode { get; set; }
public string? PermissionCode { get; set; }
public long ParentId { get; set; }
public string MenuIcon { get; set; }
public string Router { get; set; }
public string? MenuIcon { get; set; }
public string? Router { get; set; }
public bool IsLink { get; set; }
public bool IsCache { get; set; }
public bool IsShow { get; set; } = true;
public string Remark { get; set; }
public string Component { get; set; }
public string Query { get; set; }
public int OrderNum { get; set; }
public string? Remark { get; set; }
public string? Component { get; set; }
public string? Query { get; set; }
//public List<MenuEntity>? Children { get; set; }
}
}

View File

@@ -11,6 +11,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.MonitorCache
public string CacheName { get; set; }
public string CacheKey { get; set; }
public string CacheValue { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

View File

@@ -9,6 +9,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.MonitorCache
public class MonitorCacheNameGetListOutputDto
{
public string CacheName { get; set; }
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

View File

@@ -17,6 +17,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post
public bool State { get; set; }
public string PostCode { get; set; } = string.Empty;
public string PostName { get; set; } = string.Empty;
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

View File

@@ -6,6 +6,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post
{
public bool? State { get; set; }
//public string? PostCode { get; set; }=string.Empty;
public string PostName { get; set; } = string.Empty;
public string? PostName { get; set; } = string.Empty;
}
}

View File

@@ -9,7 +9,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post
public bool State { get; set; }
public string PostCode { get; set; } = string.Empty;
public string PostName { get; set; } = string.Empty;
public string Remark { get; set; }
public string? Remark { get; set; }
public int OrderNum { get; set; }
}

View File

@@ -11,7 +11,7 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post
public bool State { get; set; }
public string PostCode { get; set; } = string.Empty;
public string PostName { get; set; } = string.Empty;
public string Remark { get; set; }
public string? Remark { get; set; }
public int OrderNum { get; set; }
}

View File

@@ -10,6 +10,6 @@ namespace Yi.Furion.Core.Rbac.Dtos.Post
public bool State { get; set; }
public string PostCode { get; set; } = string.Empty;
public string PostName { get; set; } = string.Empty;
public string Remark { get; set; }
public string? Remark { get; set; }
}
}

View File

@@ -8,9 +8,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role
/// </summary>
public class RoleCreateInputVo
{
public string RoleName { get; set; }
public string RoleCode { get; set; }
public string Remark { get; set; }
public string? RoleName { get; set; }
public string? RoleCode { get; set; }
public string? Remark { get; set; }
public DataScopeEnum DataScope { get; set; } = DataScopeEnum.ALL;
public bool State { get; set; } = true;

View File

@@ -4,9 +4,10 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role
{
public class RoleGetListInputVo : PagedAllResultRequestDto
{
public string RoleName { get; set; }
public string RoleCode { get; set; }
public string? RoleName { get; set; }
public string? RoleCode { get; set; }
public bool? State { get; set; }
}
}

View File

@@ -8,9 +8,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role
public long Id { get; set; }
public DateTime CreationTime { get; set; } = DateTime.Now;
public long? CreatorId { get; set; }
public string RoleName { get; set; }
public string RoleCode { get; set; }
public string Remark { get; set; }
public string? RoleName { get; set; }
public string? RoleCode { get; set; }
public string? Remark { get; set; }
public DataScopeEnum DataScope { get; set; } = DataScopeEnum.ALL;
public bool State { get; set; }

View File

@@ -8,9 +8,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role
public long Id { get; set; }
public DateTime CreationTime { get; set; } = DateTime.Now;
public long? CreatorId { get; set; }
public string RoleName { get; set; }
public string RoleCode { get; set; }
public string Remark { get; set; }
public string? RoleName { get; set; }
public string? RoleCode { get; set; }
public string? Remark { get; set; }
public DataScopeEnum DataScope { get; set; } = DataScopeEnum.ALL;
public bool State { get; set; }

View File

@@ -4,9 +4,9 @@ namespace Yi.Furion.Core.Rbac.Dtos.Role
{
public class RoleUpdateInputVo
{
public string RoleName { get; set; }
public string RoleCode { get; set; }
public string Remark { get; set; }
public string? RoleName { get; set; }
public string? RoleCode { get; set; }
public string? Remark { get; set; }
public DataScopeEnum DataScope { get; set; } = DataScopeEnum.ALL;
public bool State { get; set; }

View File

@@ -4,14 +4,14 @@ namespace Yi.Furion.Core.Rbac.Dtos.User
{
public class ProfileUpdateInputVo
{
public string Name { get; set; }
public string? Name { get; set; }
public int? Age { get; set; }
public string Nick { get; set; }
public string Email { get; set; }
public string Address { get; set; }
public string? Nick { get; set; }
public string? Email { get; set; }
public string? Address { get; set; }
public long? Phone { get; set; }
public string Introduction { get; set; }
public string Remark { get; set; }
public string? Introduction { get; set; }
public string? Remark { get; set; }
public SexEnum? Sex { get; set; }
}
}

View File

@@ -8,21 +8,21 @@ namespace Yi.Furion.Core.Rbac.Dtos.User
/// </summary>
public class UserCreateInputVo
{
public string Name { get; set; }
public string? Name { get; set; }
public int? Age { get; set; }
public string UserName { get; set; } = string.Empty;
public string Password { get; set; } = string.Empty;
public string Icon { get; set; }
public string Nick { get; set; }
public string Email { get; set; }
public string Address { get; set; }
public string? Icon { get; set; }
public string? Nick { get; set; }
public string? Email { get; set; }
public string? Address { get; set; }
public long? Phone { get; set; }
public string Introduction { get; set; }
public string Remark { get; set; }
public string? Introduction { get; set; }
public string? Remark { get; set; }
public SexEnum Sex { get; set; } = SexEnum.Unknown;
public List<long> RoleIds { get; set; }
public List<long> PostIds { get; set; }
public List<long>? RoleIds { get; set; }
public List<long>? PostIds { get; set; }
public long? DeptId { get; set; }
public bool State { get; set; } = true;
}
}
}

View File

@@ -4,15 +4,14 @@ namespace Yi.Furion.Core.Rbac.Dtos.User
{
public class UserGetListInputVo : PagedAllResultRequestDto
{
public string Name { get; set; }
public string UserName { get; set; }
public string? Name { get; set; }
public string? UserName { get; set; }
public long? Phone { get; set; }
public bool? State { get; set; }
public long? DeptId { get; set; }
public string Ids { get; set; }
public string? Ids { get; set; }
}
}

View File

@@ -6,17 +6,17 @@ namespace Yi.Furion.Core.Rbac.Dtos.User
public class UserGetListOutputDto : IEntityDto<long>
{
public long Id { get; set; }
public string Name { get; set; }
public string? Name { get; set; }
public int? Age { get; set; }
public string UserName { get; set; } = string.Empty;
public string Icon { get; set; }
public string Nick { get; set; }
public string Email { get; set; }
public string Ip { get; set; }
public string Address { get; set; }
public string? Icon { get; set; }
public string? Nick { get; set; }
public string? Email { get; set; }
public string? Ip { get; set; }
public string? Address { get; set; }
public long? Phone { get; set; }
public string Introduction { get; set; }
public string Remark { get; set; }
public string? Introduction { get; set; }
public string? Remark { get; set; }
public SexEnum Sex { get; set; } = SexEnum.Unknown;
public long? DeptId { get; set; }
public DateTime CreationTime { get; set; } = DateTime.Now;

View File

@@ -9,17 +9,17 @@ namespace Yi.Furion.Core.Rbac.Dtos.User
public class UserGetOutputDto : IEntityDto<long>
{
public long Id { get; set; }
public string Name { get; set; }
public string? Name { get; set; }
public int? Age { get; set; }
public string UserName { get; set; } = string.Empty;
public string Icon { get; set; }
public string Nick { get; set; }
public string Email { get; set; }
public string Ip { get; set; }
public string Address { get; set; }
public string? Icon { get; set; }
public string? Nick { get; set; }
public string? Email { get; set; }
public string? Ip { get; set; }
public string? Address { get; set; }
public long? Phone { get; set; }
public string Introduction { get; set; }
public string Remark { get; set; }
public string? Introduction { get; set; }
public string? Remark { get; set; }
public SexEnum Sex { get; set; } = SexEnum.Unknown;
public bool State { get; set; }
public DateTime CreationTime { get; set; }

View File

@@ -4,25 +4,25 @@ namespace Yi.Furion.Core.Rbac.Dtos.User
{
public class UserUpdateInputVo
{
public string Name { get; set; }
public string? Name { get; set; }
public int? Age { get; set; }
public string UserName { get; set; }
public string? UserName { get; set; }
[AdaptIgnore]
public string Password { get; set; }
public string Icon { get; set; }
public string Nick { get; set; }
public string Email { get; set; }
public string Ip { get; set; }
public string Address { get; set; }
public string? Password { get; set; }
public string? Icon { get; set; }
public string? Nick { get; set; }
public string? Email { get; set; }
public string? Ip { get; set; }
public string? Address { get; set; }
public long? Phone { get; set; }
public string Introduction { get; set; }
public string Remark { get; set; }
public string? Introduction { get; set; }
public string? Remark { get; set; }
public SexEnum? Sex { get; set; }
public long? DeptId { get; set; }
public List<long> PostIds { get; set; }
public List<long>? PostIds { get; set; }
public List<long> RoleIds { get; set; }
public List<long>? RoleIds { get; set; }
public bool? State { get; set; }
}
}