同步

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