diff --git a/.gitignore b/.gitignore index af8e87d8..cb911a49 100644 --- a/.gitignore +++ b/.gitignore @@ -402,5 +402,4 @@ FodyWeavers.xsd dist/ *.[Dd]esigner.cs *.db -cache /assets/res/Ln.resx diff --git a/assets/res/Statements.ln b/assets/res/Statements.ln index ce23cf65..a8e6918c 100644 --- a/assets/res/Statements.ln +++ b/assets/res/Statements.ln @@ -22,6 +22,7 @@ XML注释文件不存在 已处理完毕 开始事务 手机号码不正确 +手机号码不能为空 支付宝账号 数据库同步开始 数据库服务器时钟偏移 diff --git a/dotnet-tools.json b/dotnet-tools.json index d36cef7e..09259295 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "jetbrains.resharper.globaltools": { - "version": "2023.3.0", + "version": "2023.3.2", "commands": [ "jb" ] diff --git a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs index f122385f..602ab86b 100644 --- a/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs +++ b/src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs @@ -15,7 +15,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary /// 消息内容 /// [JsonIgnore] - [Column(DbType = Chars.FLG_DB_FIELD_TYPE_TEXT)] + [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)] public virtual string Content { get; init; } /// diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs index 4dadc4a6..b6637f16 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs @@ -1,5 +1,4 @@ using NetAdmin.Domain.Attributes.DataValidation; -using NetAdmin.Domain.DbMaps.Dependency.Fields; using NetAdmin.Domain.DbMaps.Sys; namespace NetAdmin.Domain.Dto.Sys.User; @@ -9,12 +8,9 @@ namespace NetAdmin.Domain.Dto.Sys.User; /// public sealed record CheckMobileAvailableReq : Sys_User { - /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long Id { get; init; } - /// [Mobile] - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.手机号码不能为空))] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public override string Mobile { get; init; } } \ No newline at end of file diff --git a/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs b/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs index b47a7676..260b001b 100644 --- a/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs +++ b/src/backend/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs @@ -1,5 +1,4 @@ using NetAdmin.Domain.Attributes.DataValidation; -using NetAdmin.Domain.DbMaps.Dependency.Fields; using NetAdmin.Domain.DbMaps.Sys; namespace NetAdmin.Domain.Dto.Sys.User; @@ -9,12 +8,8 @@ namespace NetAdmin.Domain.Dto.Sys.User; /// public sealed record CheckUserNameAvailableReq : Sys_User { - /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long Id { get; init; } - /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.用户名不能为空))] [UserName] public override string UserName { get; init; } diff --git a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs index 2f6acd1f..8c221172 100644 --- a/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs +++ b/src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs @@ -229,6 +229,7 @@ public sealed class SiteMsgService( var list = await QueryMineInternal(req) .Page(req.Page, req.PageSize) .Count(out var total) + .OrderByDescending(a => a.Max(a.Value.Item1.CreatedTime)) .ToListAsync(a => new QuerySiteMsgRsp { Id = a.Max(a.Value.Item1.Id) , Title = a.Max(a.Value.Item1.Title) @@ -291,7 +292,6 @@ public sealed class SiteMsgService( f.UserSiteMsgStatus != UserSiteMsgStatues.Deleted) && (a.MsgType == SiteMsgTypes.Public || c.DeptId == contextUserInfo.DeptId || roleIds.Contains(d.RoleId) || e.UserId == contextUserInfo.Id)) - .GroupBy((a, _, _, _, _, _) => a.Id) - .OrderByDescending(a => a.Value.Item1.CreatedTime); + .GroupBy((a, _, _, _, _, _) => a.Id); } } \ No newline at end of file