同步

2021-10-19 17:44:37 +08:00
parent d31bf1af9d
commit 1d33fa487d
5 changed files with 30 additions and 5 deletions
--- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
+++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
@@ -114,8 +114,14 @@ namespace Yi.Framework.ApiMicroservice.Controllers
        /// <returns></returns>
        [HttpGet]
        public async Task<Result> GetRolesByUserId(int userId)
+<<<<<<< Updated upstream
        {            
            var roleList = await _userService.GetRolesByUser(new user() { id=userId});
+=======
+        {
+            var _user =await _userService.GetEntityById(userId);
+            var roleList = await _userService.GetRolesByUser(_user);
+>>>>>>> Stashed changes
            return Result.Success().SetData(roleList);
        }
        /// <summary>