From 71a687812231eab270262427bf13dd3a5e08903f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Tue, 19 Oct 2021 17:57:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/UserController.cs             |  15 --------------
 .../Yi.Framework.ApiMicroservice/YIDB.db      | Bin 65536 -> 65536 bytes
 Yi.Vue/src/views/AdmUser.vue                  |  19 +++++++++++++-----
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
index 605f7ef8..da355365 100644
--- 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>
diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db
index 8f8280d7df279196d072660a70029a3f1798d353..62b8f9b65fcc8d8e3e5844bc3ef2df5ffb8c2e8d 100644
GIT binary patch
delta 247
zcmXAjJqp4=6omI@c9RXrn99}@<RUg6X>Z~UL<lw>AYCj(L=Xi*K}5tN+GyeKrkVG?
zDTdE`c#nnjBOyf2R`AOk&phzWC%0_ta=hfk6k1ASj0*<_R=Y^C0}ucvkD!nRP+Dr|
ziZs~7!H!q%xaNaLHg!3iv&tajV3972vv7fJU&AB>dQ^Gc%?8una3lERhcDiF;fZ^0
Zg5io)k||QUlr|=kBoKd<r_6Ma`vdgFCrbbT

delta 197
zcmW-bF$w}P5JhK_Nn!-~EZbXn0&6Reut&-jJb_mb_68OnVVh+a1O*Whi`7O8Cus)W
zhxh-aBq_;(Q;jD%^n@>NIHSiKeOql$*pPS|**RyKorow15e1DTC>YB&#yKA9ciEqC
zMTY@HTdj{+dWkCfAe?<yP;$eJoeAx<Uo<sdDvyL8KDgt85n~zOHL@zZK3^$66xSP@
J6BDd%{{etVC3FA)

diff --git a/Yi.Vue/src/views/AdmUser.vue b/Yi.Vue/src/views/AdmUser.vue
index 620c6122..fe42156d 100644
--- a/Yi.Vue/src/views/AdmUser.vue
+++ b/Yi.Vue/src/views/AdmUser.vue
@@ -36,13 +36,17 @@ export default {
   methods: {
     async showItem(item) {
       var strInfo = "";
-      Object.keys(item).forEach(function (key) {
+         userApi.GetRolesByUserId(item.id).then(async(resp)=>{
+
+const roleData=resp.data;
+strInfo+="拥有的角色:<br>"
+roleData.forEach(u=>{strInfo+=u.role_name+"<br>"})
+
+strInfo+="<hr>"
+                 Object.keys(item).forEach(async function (key) {
         strInfo += key + ":" + item[key] + "<br>";
       });
-      userApi.GetRolesByUserId(item.id).then(resp=>{
-const roleData=resp.data;
-roleData.forEach(u=>{strInfo+="角色名:"+u.role_name})
-})
+   
       await this.$dialog.confirm({
         text: strInfo,
         title: "信息详情",
@@ -50,6 +54,11 @@ roleData.forEach(u=>{strInfo+="角色名:"+u.role_name})
           true: "关闭",
         },
       });
+
+
+
+})
+
     },
     init() {
       roleApi.getRole().then((resp) => {