v2 dbug

performance/Performance.Api/Controllers/AccountController.cs

@@ -69,6 +69,33 @@ public ApiResponse<UserIdentity> Login([FromBody]LoginRequest request)
         }
 
         /// <summary>
+        /// 修改个人信息
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("updateself")]
+        [HttpPost]
+        public ApiResponse<UserResponse> UpdateSelf([CustomizeValidator(RuleSet = "Self"), FromBody]UserRequest request)
+        {
+            request.ID = _claim.At(request.Token).UserID;
+            var user = _userService.UpdateSelf(request);
+            return new ApiResponse<UserResponse>(ResponseType.OK, user);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("list")]
+        [HttpPost]
+        public ApiResponse<List<UserResponse>> List([FromBody]ApiRequest request)
+        {
+            var userList = _userService.GetUserList(_claim.At(request.Token).UserID);
+            return new ApiResponse<List<UserResponse>>(ResponseType.OK, "ok", userList);
+        }
+
+        /// <summary>
         /// 新增用户
         /// </summary>
         /// <param name="request"></param>

performance/Performance.DtoModels/Request/UserRequest.cs

@@ -61,7 +61,20 @@ public UserRequestValidator()
             {
                 action();
                 RuleFor(x => x.ID).NotNull().NotEmpty().GreaterThan(0);
-                RuleFor(x => x.States).NotNull().NotEmpty().InclusiveBetween(1, 2);
+                RuleFor(x => x.States).InclusiveBetween(1, 2);
+                RuleFor(x => x.Password).Length(4, 20);
+            });
+
+            RuleSet("Self", () =>
+            {
+                RuleFor(x => x.Password).Length(4, 20);
+                RuleFor(x => x.Mobile).Must((pre) =>
+                {
+                    if (!string.IsNullOrEmpty(pre))
+                        return CustomValidator.IsMobile(pre);
+                    return true;
+                });
+                RuleFor(x => x.Mail).EmailAddress().When(pre => { return !string.IsNullOrEmpty(pre.Mail); });
             });
         }
     }

performance/Performance.Services/UserService.cs

@@ -66,6 +66,17 @@ public UserIdentity Login(LoginRequest request)
         }
 
         /// <summary>
+        /// 查询用户列表
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <returns></returns>
+        public List<UserResponse> GetUserList(int userID)
+        {
+            var userlist = _userRepository.GetEntities(t => t.CreateUser == userID);
+            return Mapper.Map<List<UserResponse>>(userlist);
+        }
+
+        /// <summary>
         /// 新增用户
         /// </summary>
         /// <param name="request"></param>
@@ -141,6 +152,37 @@ public UserResponse Update(UserRequest request)
             user.RealName = request.RealName;
             user.Mail = request.Mail;
             user.States = request.States;
+            user.Password = string.IsNullOrEmpty(request.Password) ? user.Password : request.Password;
+
+            if (!_userRepository.Update(user))
+                throw new PerformanceException("保存失败");
+            return Mapper.Map<UserResponse>(user);
+        }
+
+
+        /// <summary>
+        /// 修改个人信息
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public UserResponse UpdateSelf(UserRequest request)
+        {
+            var user = _userRepository.GetEntity(t => t.ID == request.ID);
+            if (null == user)
+                throw new PerformanceException($"用户不存在 UserId：{request.ID}");
+
+            var vlist = _userRepository.GetEntities(t => t.ID != user.ID && t.Login == request.Login);
+            if (null != vlist && vlist.Count() > 0)
+                throw new PerformanceException("登录名重复");
+
+            vlist = _userRepository.GetEntities(t => t.ID != user.ID && t.Mobile == request.Mobile);
+            if (null != vlist && vlist.Count() > 0)
+                throw new PerformanceException("手机号重复");
+
+            user.Mobile = string.IsNullOrEmpty(request.RealName) ? user.Mobile : request.Mobile;
+            user.RealName = string.IsNullOrEmpty(request.RealName) ? user.RealName : request.RealName;
+            user.Mail = string.IsNullOrEmpty(request.Mail) ? user.Mail : request.Mail;
+            user.Password = string.IsNullOrEmpty(request.Password) ? user.Password : request.Password;
 
             if (!_userRepository.Update(user))
                 throw new PerformanceException("保存失败");