diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/GiveUserSetRoleDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/GiveUserSetRoleDto.cs index 27516a0e..07b2f243 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/GiveUserSetRoleDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/GiveUserSetRoleDto.cs @@ -8,7 +8,7 @@ namespace Yi.Framework.DtoModel.Base.Dto { public class GiveUserSetRoleDto { - public List UserIds { get; set; } - public List RoleIds { get; set; } + public List? UserIds { get; set; } + public List? RoleIds { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/LoginDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/LoginDto.cs index 4d8673d3..3563756f 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/LoginDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/LoginDto.cs @@ -8,11 +8,11 @@ namespace Yi.Framework.DtoModel.Base.Dto { public class LoginDto { - public string UserName { get; set; } - public string Password { get; set; } + public string UserName { get; set; }=string.Empty; + public string Password { get; set; } = string.Empty; - public string Uuid { get; set; } + public string? Uuid { get; set; } - public string Code { get; set; } + public string? Code { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/RegisterDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/RegisterDto.cs index e65d71f7..af6091c3 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/RegisterDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/RegisterDto.cs @@ -8,9 +8,9 @@ namespace Yi.Framework.DtoModel.Base.Dto { public class RegisterDto { - public string UserName { get; set; } - public string Password { get; set; } + public string UserName { get; set; } = string.Empty; + public string Password { get; set; } = string.Empty; - public string Name { get; set; } + public string Name { get; set; } = string.Empty; } } diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UserInfoDto.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UserInfoDto.cs index 7ca3beaf..39f2f142 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UserInfoDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Dto/UserInfoDto.cs @@ -9,9 +9,9 @@ namespace Yi.Framework.DtoModel.Base.Dto { public class UserInfoDto { - public UserEntity User { get; set; } - public List RoleIds { get; set; } - public List PostIds { get; set; } + public UserEntity? User { get; set; } + public List? RoleIds { get; set; } + public List? PostIds { get; set; } public long? DeptId { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/ArticleVo.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/ArticleVo.cs index 2d0ad242..8a80c75d 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/ArticleVo.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/ArticleVo.cs @@ -10,9 +10,9 @@ namespace Yi.Framework.DtoModel.Base.Vo { public long Id { get; set; } - public string Title { get; set; } + public string Title { get; set; } = string.Empty; - public string Content { get; set; } + public string Content { get; set; } = string.Empty; public long? UserId { get; set; } @@ -30,10 +30,10 @@ namespace Yi.Framework.DtoModel.Base.Vo public int? OrderNum { get; set; } - public string Remark { get; set; } - public List Images { get; set; } + public string? Remark { get; set; } + public List? Images { get; set; } public int? AgreeNum { get; set; } - public UserVo User { get; set; } + public UserVo? User { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/CommentVo.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/CommentVo.cs index 6691ee9c..d29bb651 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/CommentVo.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/CommentVo.cs @@ -14,7 +14,7 @@ namespace Yi.Framework.DtoModel.Base.Vo /// /// 评论内容 /// - public string Content { get; set; } + public string Content { get; set; }=string.Empty; /// /// 点赞数 /// @@ -41,7 +41,7 @@ namespace Yi.Framework.DtoModel.Base.Vo /// 描述 /// - public string Remark { get; set; } + public string? Remark { get; set; } /// /// 子评论数 /// @@ -51,11 +51,11 @@ namespace Yi.Framework.DtoModel.Base.Vo /// /// 被回复的用户信息 /// - public UserVo UserInfo { get; set; } + public UserVo? UserInfo { get; set; } /// /// 创建评论的用户信息 /// - public UserVo CreateUserInfo { get; set; } + public UserVo? CreateUserInfo { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/UserVo.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/UserVo.cs index bf7e34e6..bee6b72e 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/UserVo.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/Base/Vo/UserVo.cs @@ -11,15 +11,15 @@ namespace Yi.Framework.DtoModel.Base.Vo /// public class UserVo { - 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; } - public string Icon { get; set; } + public string? Icon { get; set; } - public string Nick { get; set; } + public string? Nick { get; set; } //public string Email { get; set; } @@ -30,7 +30,7 @@ namespace Yi.Framework.DtoModel.Base.Vo //public string Phone { get; set; } - public string Introduction { get; set; } + public string? Introduction { get; set; } public int? Sex { get; set; } } diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IStudentService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IStudentService.cs index f44e3795..a51c3275 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IStudentService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/RABC/IStudentService.cs @@ -9,6 +9,5 @@ namespace Yi.Framework.Interface.RABC public interface IStudentService : ICrudAppService { void GetError(); - Task> GetListAsync(); } } \ No newline at end of file diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Base/Entity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Base/Entity.cs index 6d6fb88d..6775a079 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/Base/Entity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/Base/Entity.cs @@ -8,7 +8,7 @@ namespace Yi.Framework.Model.Base { public class Entity : IEntity { - public Key Id { get; set; } + public Key Id { get; set; }=default(Key)!; public object[] GetKeys() { diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Base/EntityDto.cs b/Yi.Framework.Net6/Yi.Framework.Model/Base/EntityDto.cs index ad710e6a..0c02ac0c 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/Base/EntityDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/Base/EntityDto.cs @@ -12,7 +12,7 @@ namespace Yi.Framework.Model.Base // // 摘要: // Id of the entity. - public TKey Id { get; set; } + public TKey? Id { get; set; } public override string ToString() { diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Base/IEntityDto.cs b/Yi.Framework.Net6/Yi.Framework.Model/Base/IEntityDto.cs index db4615d0..7ca28db0 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/Base/IEntityDto.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/Base/IEntityDto.cs @@ -13,6 +13,6 @@ namespace Yi.Framework.Model.Base public interface IEntityDto : IEntityDto { - TKey Id { get; set; } + TKey? Id { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryParameter.cs b/Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryParameter.cs index e2f45c0d..9a4b4385 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryParameter.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/Base/Query/QueryParameter.cs @@ -11,8 +11,8 @@ namespace Yi.Framework.Model.Base.Query { public class QueryParameter { - public string Key { get; set; } - public string Value { get; set; } + public string? Key { get; set; } + public string? Value { get; set; } [JsonConverter(typeof(StringEnumConverter))] public ConditionalType Type { get; set; } = ConditionalType.Like; } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/MaterialEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/MaterialEntity.cs index 17c8bb78..7c46f9e6 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/MaterialEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/MaterialEntity.cs @@ -30,21 +30,21 @@ namespace Yi.Framework.Model.ERP.Entitys /// /// 物料编码 /// - public string Code { get; set; } + public string Code { get; set; }=string.Empty; /// /// 物料名称 /// - public string Name { get; set; } + public string Name { get; set; }=string.Empty; /// /// 物料单位 /// - public string UnitName { get; set; } + public string UnitName { get; set; }=string.Empty; /// /// 备注 /// - public string Remarks { get; set; } + public string? Remarks { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs index 537cc4e3..d5adaeb9 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs @@ -20,7 +20,7 @@ namespace Yi.Framework.Model.ERP.Entitys /// [JsonConverter(typeof(ValueToStringConverter))] [SugarColumn(IsPrimaryKey = true)] - public long Id { get; set; } + public long Id { get; set; } /// /// 租户id @@ -35,28 +35,28 @@ namespace Yi.Framework.Model.ERP.Entitys /// /// 物料id /// - public long MaterialId { get; set; } + public long MaterialId { get; set; } /// /// 物料名称 /// - public string MaterialName { get; set; } + public string MaterialName { get; set; }=string.Empty; /// /// 物料单位 /// - public string MaterialUnit { get; set; } + public string MaterialUnit { get; set; }=string.Empty ; /// /// 单价 /// - public float UnitPrice { get; set; } + public float UnitPrice { get; set; } /// /// 总数量 /// - public long TotalNumber { get; set; } + public long TotalNumber { get; set; } /// /// 已完成数量 /// @@ -64,6 +64,6 @@ namespace Yi.Framework.Model.ERP.Entitys /// /// 备注 /// - public string Remarks { get; set; } + public string? Remarks { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs index b5759df2..cce541b0 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs @@ -30,22 +30,22 @@ namespace Yi.Framework.Model.ERP.Entitys /// /// 采购单号 /// - public string Code { get; set; } + public string Code { get; set; }=string.Empty; /// /// 需求时间 /// - public DateTime NeedTime { get; set; } + public DateTime? NeedTime { get; set; } /// /// 采购员 /// - public string Buyer { get; set; } + public string? Buyer { get; set; } /// /// 总共金额 /// - public float TotalMoney { get; set; } + public float TotalMoney { get; set; } /// /// 已支付金额 @@ -55,7 +55,8 @@ namespace Yi.Framework.Model.ERP.Entitys /// /// 采购状态 /// - public PurchaseStateEnum PurchaseState { get; set; } + public PurchaseStateEnum PurchaseState { get; set; } = PurchaseStateEnum.Build; + } public enum PurchaseStateEnum diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/SupplierEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/SupplierEntity.cs index 11217e4b..4e77c121 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/SupplierEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/SupplierEntity.cs @@ -30,29 +30,29 @@ namespace Yi.Framework.Model.ERP.Entitys /// /// 供应商编码 /// - public string Code { get; set; } + public string Code { get; set; } = string.Empty; /// /// 供应商名称 /// - public string Name { get; set; } + public string Name { get; set; }= string.Empty; /// /// 供应商地址 /// - public string Address { get; set; } + public string? Address { get; set; } /// /// 电话 /// - public long Phone { get; set; } + public long? Phone { get; set; } /// /// 传真 /// - public string Fax { get; set; } + public string? Fax { get; set; } /// /// 邮箱 /// - public string Email { get; set; } + public string? Email { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/UnitEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/UnitEntity.cs index 3d9e65c7..9acd4091 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/UnitEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/UnitEntity.cs @@ -20,7 +20,7 @@ namespace Yi.Framework.Model.ERP.Entitys /// [JsonConverter(typeof(ValueToStringConverter))] [SugarColumn(IsPrimaryKey = true)] - public long Id { get; set; } + public long Id { get; set; } /// /// 租户id @@ -30,16 +30,16 @@ namespace Yi.Framework.Model.ERP.Entitys /// /// 单位编码 /// - public string Code { get; set; } + public string Code { get; set; }=string.Empty; /// /// 单位名称 /// - public string Name { get; set; } + public string Name { get; set; }=string.Empty; /// /// 备注 /// - public string Remarks { get; set; } + public string? Remarks { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/WarehouseEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/WarehouseEntity.cs index 52abcf65..1e3dc902 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/WarehouseEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/WarehouseEntity.cs @@ -21,7 +21,7 @@ namespace Yi.Framework.Model.ERP.Entitys /// [JsonConverter(typeof(ValueToStringConverter))] [SugarColumn(IsPrimaryKey = true)] - public long Id { get; set; } + public long Id { get; set; } /// /// 租户id @@ -31,21 +31,21 @@ namespace Yi.Framework.Model.ERP.Entitys /// /// 仓库编码 /// - public string Code { get; set; } + public string Code { get; set; }=string.Empty; /// /// 仓库名称 /// - public string Name { get; set; } + public string Name { get; set; }=string.Empty ; /// /// 备注 /// - public string Remarks { get; set; } + public string? Remarks { get; set; } /// /// 状态 /// - public StateEnum State { get; set; } + public StateEnum State { get; set; } = StateEnum.Normal; } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/StudentEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/StudentEntity.cs index 8bf2ed05..a56a52f2 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/StudentEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/StudentEntity.cs @@ -7,8 +7,8 @@ namespace Yi.Framework.Model.RABC.Entitys [SugarTable("Student")] public class StudentEntity : IEntity, IMultiTenant { - public string Name { get; set; } - public string Remark { get; set; } + public string? Name { get; set; } + public string? Remark { get; set; } [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] public Guid Id { get; set; } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserEntity.cs index ce4da3e8..cb7e35f1 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/RABC/Entitys/UserEntity.cs @@ -146,7 +146,7 @@ namespace Yi.Framework.Model.RABC.Entitys /// /// 构建密码,MD5盐值加密 /// - public UserEntity BuildPassword(string password = null) + public UserEntity BuildPassword(string? password = null) { //如果不传值,那就把自己的password当作传进来的password if (password == null) diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/CategoryEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/CategoryEntity.cs index 50eb4512..1fe7ef63 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/CategoryEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/CategoryEntity.cs @@ -29,7 +29,7 @@ namespace Yi.Framework.Model.SHOP.Entitys /// 分类名称 /// [SugarColumn(ColumnName = "CategoryName")] - public string CategoryName { get; set; } + public string? CategoryName { get; set; } /// /// 创建者 /// diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsEntity.cs index ab855b32..03b3482f 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsEntity.cs @@ -29,7 +29,7 @@ namespace Yi.Framework.Model.SHOP.Entitys /// 商品规格名 /// [SugarColumn(ColumnName = "SpecsName")] - public string SpecsName { get; set; } + public string? SpecsName { get; set; } /// /// 创建者 /// diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsGroupEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsGroupEntity.cs index 9ebc176e..a1683818 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsGroupEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/SHOP/Entitys/SpecsGroupEntity.cs @@ -29,7 +29,7 @@ namespace Yi.Framework.Model.SHOP.Entitys /// 商品规格组名 /// [SugarColumn(ColumnName = "SpecsGroupName")] - public string SpecsGroupName { get; set; } + public string? SpecsGroupName { get; set; } /// /// 创建者 /// diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj b/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj index bc576f7a..65794c4f 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj +++ b/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj @@ -6,11 +6,11 @@ - 1701;1702;CS8625;CS8618 + 1701;1702 - 1701;1702;CS8625;CS8618 + 1701;1702 diff --git a/Yi.Framework.Net6/Yi.Framework.Service/RABC/StudentService.cs b/Yi.Framework.Net6/Yi.Framework.Service/RABC/StudentService.cs index a441f5e6..a0fddf0a 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/RABC/StudentService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/RABC/StudentService.cs @@ -14,11 +14,6 @@ namespace Yi.Framework.Service.RABC { public class StudentService : CrudAppService, IStudentService { - public async Task> GetListAsync() - { - return await MapToGetListOutputDtosAsync(await Repository.GetListAsync()); - } - public void GetError() { throw new ApplicationException(StudentConst.学生异常错误);