diff --git a/LMS.Common/Dictionary/SimpleOptions.cs b/LMS.Common/Dictionary/SimpleOptions.cs
index e2e6701..af94ff7 100644
--- a/LMS.Common/Dictionary/SimpleOptions.cs
+++ b/LMS.Common/Dictionary/SimpleOptions.cs
@@ -7,5 +7,4 @@ public class SimpleOptions
{ "ttsrole", ["EdgeTTsRoles"] },
{ "laitoolinfo", ["LaitoolHomePage", "LaitoolNotice", "LaitoolUpdateContent", "LaitoolVersion"] },
};
-}
-
+}
\ No newline at end of file
diff --git a/LMS.Repository/DB/User.cs b/LMS.Repository/DB/User.cs
index 1611f26..e078bc9 100644
--- a/LMS.Repository/DB/User.cs
+++ b/LMS.Repository/DB/User.cs
@@ -56,6 +56,16 @@ namespace LMS.Repository.Models.DB
///
public string AffiliateCode { get; set; } = string.Empty;
+ ///
+ /// 用户微信号
+ ///
+ public string? WXNumber { get; set; }
+
+ ///
+ /// 备注
+ ///
+ public string? Remark { get; set; }
+
///
/// 实际使用的Options
///
diff --git a/LMS.Repository/DTO/UserDto/UserCollectionDto.cs b/LMS.Repository/DTO/UserDto/UserCollectionDto.cs
index e7d0f7a..67da545 100644
--- a/LMS.Repository/DTO/UserDto/UserCollectionDto.cs
+++ b/LMS.Repository/DTO/UserDto/UserCollectionDto.cs
@@ -13,5 +13,7 @@
public string LastLoginIp { get; set; } = string.Empty;
public string LastLoginDevice { get; set; } = string.Empty;
+
+ public string Remark { get; set; } = string.Empty;
}
}
diff --git a/LMS.Repository/DTO/UserDto/UserDto.cs b/LMS.Repository/DTO/UserDto/UserDto.cs
index 9beff27..41a2dfb 100644
--- a/LMS.Repository/DTO/UserDto/UserDto.cs
+++ b/LMS.Repository/DTO/UserDto/UserDto.cs
@@ -30,8 +30,16 @@ namespace LMS.Repository.DTO.UserDto
///
public string AffiliateCode { get; set; } = string.Empty;
+ ///
+ /// 所属用户ID
+ ///
public long ParentId { get; set; }
+ ///
+ /// 备注
+ ///
+ public string? Remark { get; set; } = string.Empty;
+
///
/// 放一些操作信息 不能频繁的修改数据库,使用的json格式存放
///
diff --git a/LMS.Repository/User/UpdatedUserModel.cs b/LMS.Repository/User/UpdatedUserModel.cs
index b5ef95b..25a7d2f 100644
--- a/LMS.Repository/User/UpdatedUserModel.cs
+++ b/LMS.Repository/User/UpdatedUserModel.cs
@@ -10,5 +10,7 @@
public string? UserName { get; set; }
public string? PhoneNumber { get; set; }
public List? RoleNames { get; set; }
+
+ public string? Remark { get; set; }
}
}
\ No newline at end of file
diff --git a/LMS.service/Controllers/UserController.cs b/LMS.service/Controllers/UserController.cs
index 37278ec..9965a42 100644
--- a/LMS.service/Controllers/UserController.cs
+++ b/LMS.service/Controllers/UserController.cs
@@ -176,10 +176,10 @@ namespace LMS.service.Controllers
///
[HttpGet]
[Authorize]
- public async Task>>> QueryUserCollection([Required] int page, [Required] int pageSize, string userName, long? userId, string nickName, string phoneNumber, string email, string[] roleNames, long? parentId)
+ public async Task>>> QueryUserCollection([Required] int page, [Required] int pageSize, string userName, long? userId, string nickName, string phoneNumber, string email, string[] roleNames, string remark, long? parentId)
{
long reuqertUserId = ConvertExtension.ObjectToLong(HttpContext.Items["UserId"] ?? 0);
- return await _userService.QueryUserCollection(page, pageSize, userName, userId, nickName, phoneNumber, email, roleNames, parentId, reuqertUserId);
+ return await _userService.QueryUserCollection(page, pageSize, userName, userId, nickName, phoneNumber, email, roleNames, remark, parentId, reuqertUserId);
}
#endregion
@@ -199,7 +199,7 @@ namespace LMS.service.Controllers
}
#endregion
- #region 将用户升级为代理
+ #region 将用户升级为代理
[HttpPost]
[Authorize]
diff --git a/LMS.service/Service/UserService/UserService.cs b/LMS.service/Service/UserService/UserService.cs
index 3d25c02..5bdbbd5 100644
--- a/LMS.service/Service/UserService/UserService.cs
+++ b/LMS.service/Service/UserService/UserService.cs
@@ -73,7 +73,8 @@ namespace LMS.service.Service.UserService
Options = user.OptionsJson,
AgentPercent = user.AgentPercent,
AffiliateCode = user.AffiliateCode,
- ParentId = user.ParentId ?? 0
+ ParentId = user.ParentId ?? 0,
+ Remark = user.Remark ?? string.Empty
};
return APIResponseModel.CreateSuccessResponseModel(userDto);
}
@@ -87,7 +88,7 @@ namespace LMS.service.Service.UserService
#region 查询用户列表
- internal async Task>>> QueryUserCollection(int page, int pageSize, string userName, long? userId, string nickName, string phoneNumber, string email, string[] roleNames, long? parentId, long reuqertUserId)
+ internal async Task>>> QueryUserCollection(int page, int pageSize, string userName, long? userId, string nickName, string phoneNumber, string email, string[] roleNames, string? remark, long? parentId, long reuqertUserId)
{
try
{
@@ -173,6 +174,11 @@ namespace LMS.service.Service.UserService
query = query.Where(x => !string.IsNullOrWhiteSpace(x.Email) && x.Email.Contains(email));
}
+ if (!string.IsNullOrWhiteSpace(remark))
+ {
+ query = query.Where(x => !string.IsNullOrWhiteSpace(x.Remark) && x.Remark.Contains(remark));
+ }
+
if (roleIds.Count > 0)
{
query = query.Where(x => userIds.Contains(x.Id));
@@ -199,9 +205,10 @@ namespace LMS.service.Service.UserService
PhoneNumber = x.PhoneNumber ?? string.Empty,
CreatedDate = x.CreatedDate,
LastLoginDate = x.LastLoginDate,
- LastLoginIp = x.LastLoginIp,
- LastLoginDevice = x.LastLoginDevice,
- ParentId = x.ParentId ?? 0
+ LastLoginIp = x.LastLoginIp ?? string.Empty,
+ LastLoginDevice = x.LastLoginDevice ?? string.Empty,
+ ParentId = x.ParentId ?? 0,
+ Remark = x.Remark ?? string.Empty
}).ToList();
for (int i = 0; i < userCollections.Count; i++)
{
@@ -262,6 +269,12 @@ namespace LMS.service.Service.UserService
return APIResponseModel.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
}
+ if (string.IsNullOrWhiteSpace(userModel.Remark))
+ {
+ return APIResponseModel.CreateErrorResponseModel(ResponseCode.ParameterError, "备注必填");
+ }
+ user.Remark = userModel.Remark;
+
// 开始修改用户信息
if (userModel.AgentPercent != null)
{