新增 用户备注 管理员再用户编辑时可填

LMS.service/Controllers/UserController.cs

@@ -176,10 +176,10 @@ namespace LMS.service.Controllers
         /// <returns></returns>
         [HttpGet]
         [Authorize]
-        public async Task<ActionResult<APIResponseModel<CollectionResponse<UserCollectionDto>>>> QueryUserCollection([Required] int page, [Required] int pageSize, string userName, long? userId, string nickName, string phoneNumber, string email, string[] roleNames, long? parentId)
+        public async Task<ActionResult<APIResponseModel<CollectionResponse<UserCollectionDto>>>> 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]

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<UserDto>.CreateSuccessResponseModel(userDto);
             }
@@ -87,7 +88,7 @@ namespace LMS.service.Service.UserService
 
         #region 查询用户列表
 
-        internal async Task<ActionResult<APIResponseModel<CollectionResponse<UserCollectionDto>>>> QueryUserCollection(int page, int pageSize, string userName, long? userId, string nickName, string phoneNumber, string email, string[] roleNames, long? parentId, long reuqertUserId)
+        internal async Task<ActionResult<APIResponseModel<CollectionResponse<UserCollectionDto>>>> 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<string>.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
                 }
 
+                if (string.IsNullOrWhiteSpace(userModel.Remark))
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError, "备注必填");
+                }
+                user.Remark = userModel.Remark;
+
                 // 开始修改用户信息
                 if (userModel.AgentPercent != null)
                 {