lingyun/NetAdmin
lingyun/NetAdmin
Template
7
0
Fork 0
mirror of https://github.com/nsnail/NetAdmin.git synced 2025-06-17 01:13:22 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

fix: 🐛 小问题 (#76)

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

1
assets/res/Statements.ln
View File

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

2
dotnet-tools.json
View File

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

2
src/backend/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs
View File

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

8
src/backend/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs
View File

@ -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;
/// </summary>
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" />
[Mobile]
[JsonIgnore(Condition = JsonIgnoreCondition.Never)]
[Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.手机号码不能为空))]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public override string Mobile { get; init; }
}

7
src/backend/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs
View File

@ -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;
/// </summary>
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" />
[JsonIgnore(Condition = JsonIgnoreCondition.Never)]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
[Required(ErrorMessageResourceType = typeof(Ln), ErrorMessageResourceName = nameof(Ln.用户名不能为空))]
[UserName]
public override string UserName { get; init; }

4
src/backend/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs
View File

@ -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);
}
}