fix: 🐛 小问题 (#76)

This commit is contained in:
nsnail 2023-12-28 15:30:37 +08:00 committed by GitHub
parent 96e7e3384f
commit 52ddf273c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 17 deletions

1
.gitignore vendored
View File

@ -402,5 +402,4 @@ FodyWeavers.xsd
dist/ dist/
*.[Dd]esigner.cs *.[Dd]esigner.cs
*.db *.db
cache
/assets/res/Ln.resx /assets/res/Ln.resx

View File

@ -22,6 +22,7 @@ XML注释文件不存在
已处理完毕 已处理完毕
开始事务 开始事务
手机号码不正确 手机号码不正确
手机号码不能为空
支付宝账号 支付宝账号
数据库同步开始 数据库同步开始
数据库服务器时钟偏移 数据库服务器时钟偏移

View File

@ -15,7 +15,7 @@
] ]
}, },
"jetbrains.resharper.globaltools": { "jetbrains.resharper.globaltools": {
"version": "2023.3.0", "version": "2023.3.2",
"commands": [ "commands": [
"jb" "jb"
] ]

View File

@ -15,7 +15,7 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary
/// 消息内容 /// 消息内容
/// </summary> /// </summary>
[JsonIgnore] [JsonIgnore]
[Column(DbType = Chars.FLG_DB_FIELD_TYPE_TEXT)] [Column(DbType = Chars.FLG_DB_FIELD_TYPE_VARCHAR_255)]
public virtual string Content { get; init; } public virtual string Content { get; init; }
/// <summary> /// <summary>

View File

@ -1,5 +1,4 @@
using NetAdmin.Domain.Attributes.DataValidation; using NetAdmin.Domain.Attributes.DataValidation;
using NetAdmin.Domain.DbMaps.Dependency.Fields;
using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.DbMaps.Sys;
namespace NetAdmin.Domain.Dto.Sys.User; namespace NetAdmin.Domain.Dto.Sys.User;
@ -9,12 +8,9 @@ namespace NetAdmin.Domain.Dto.Sys.User;
/// </summary> /// </summary>
public sealed record CheckMobileAvailableReq : Sys_User public sealed record CheckMobileAvailableReq : Sys_User
{ {
/// <inheritdoc cref="IFieldPrimary{T}.Id" />
[JsonIgnore(Condition = JsonIgnoreCondition.Never)]
public override long Id { get; init; }
/// <inheritdoc cref="Sys_User.Mobile" /> /// <inheritdoc cref="Sys_User.Mobile" />
[Mobile] [Mobile]
[JsonIgnore(Condition = JsonIgnoreCondition.Never)] [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.手机号码不能为空))]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public override string Mobile { get; init; } public override string Mobile { get; init; }
} }

View File

@ -1,5 +1,4 @@
using NetAdmin.Domain.Attributes.DataValidation; using NetAdmin.Domain.Attributes.DataValidation;
using NetAdmin.Domain.DbMaps.Dependency.Fields;
using NetAdmin.Domain.DbMaps.Sys; using NetAdmin.Domain.DbMaps.Sys;
namespace NetAdmin.Domain.Dto.Sys.User; namespace NetAdmin.Domain.Dto.Sys.User;
@ -9,12 +8,8 @@ namespace NetAdmin.Domain.Dto.Sys.User;
/// </summary> /// </summary>
public sealed record CheckUserNameAvailableReq : Sys_User public sealed record CheckUserNameAvailableReq : Sys_User
{ {
/// <inheritdoc cref="IFieldPrimary{T}.Id" />
[JsonIgnore(Condition = JsonIgnoreCondition.Never)]
public override long Id { get; init; }
/// <inheritdoc cref="Sys_User.UserName" /> /// <inheritdoc cref="Sys_User.UserName" />
[JsonIgnore(Condition = JsonIgnoreCondition.Never)] [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
[Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.用户名不能为空))] [Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.用户名不能为空))]
[UserName] [UserName]
public override string UserName { get; init; } public override string UserName { get; init; }

View File

@ -229,6 +229,7 @@ public sealed class SiteMsgService(
var list = await QueryMineInternal(req) var list = await QueryMineInternal(req)
.Page(req.Page, req.PageSize) .Page(req.Page, req.PageSize)
.Count(out var total) .Count(out var total)
.OrderByDescending(a => a.Max(a.Value.Item1.CreatedTime))
.ToListAsync(a => new QuerySiteMsgRsp { .ToListAsync(a => new QuerySiteMsgRsp {
Id = a.Max(a.Value.Item1.Id) Id = a.Max(a.Value.Item1.Id)
, Title = a.Max(a.Value.Item1.Title) , Title = a.Max(a.Value.Item1.Title)
@ -291,7 +292,6 @@ public sealed class SiteMsgService(
f.UserSiteMsgStatus != UserSiteMsgStatues.Deleted) && f.UserSiteMsgStatus != UserSiteMsgStatues.Deleted) &&
(a.MsgType == SiteMsgTypes.Public || c.DeptId == contextUserInfo.DeptId || (a.MsgType == SiteMsgTypes.Public || c.DeptId == contextUserInfo.DeptId ||
roleIds.Contains(d.RoleId) || e.UserId == contextUserInfo.Id)) roleIds.Contains(d.RoleId) || e.UserId == contextUserInfo.Id))
.GroupBy((a, _, _, _, _, _) => a.Id) .GroupBy((a, _, _, _, _, _) => a.Id);
.OrderByDescending(a => a.Value.Item1.CreatedTime);
} }
} }