From 1d33fa487d28b4c8d6d2f8120ff162cf3f206984 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:44:37 +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                    |  6 ++++++
 Yi.Vue/src/api/userApi.js                            |  7 +++++++
 Yi.Vue/src/components/ccTreeview.vue                 |  1 +
 Yi.Vue/src/views/AdmRoleMenu.vue                     | 12 ++++++++++++
 Yi.Vue/src/views/AdmUser.vue                         |  9 ++++-----
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
index da355365..62fc98df 100644
--- 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>
diff --git a/Yi.Vue/src/api/userApi.js b/Yi.Vue/src/api/userApi.js
index 6ca7e20d..6fba2ccb 100644
--- a/Yi.Vue/src/api/userApi.js
+++ b/Yi.Vue/src/api/userApi.js
@@ -7,10 +7,17 @@ export default {
             data: { "ids1": userIds, "ids2": roleIds }
         })
     },
+
     GetRolesByUser() {
         return myaxios({
             url: '/User/GetRolesByUser',
             method: 'get'
         })
+    },
+    GetRolesByUserId(userId) {
+        return myaxios({
+            url: `/User/GetRolesByUserId?userId=${userId}`,
+            method: 'get'
+        })
     }
 }
\ No newline at end of file
diff --git a/Yi.Vue/src/components/ccTreeview.vue b/Yi.Vue/src/components/ccTreeview.vue
index 23c7eff3..5e055930 100644
--- a/Yi.Vue/src/components/ccTreeview.vue
+++ b/Yi.Vue/src/components/ccTreeview.vue
@@ -116,6 +116,7 @@ export default {
           position: "top-right",
           timeout: 5000,
         });
+               this.init();
       });
     },
 
diff --git a/Yi.Vue/src/views/AdmRoleMenu.vue b/Yi.Vue/src/views/AdmRoleMenu.vue
index 3324ac0b..6ff74daf 100644
--- a/Yi.Vue/src/views/AdmRoleMenu.vue
+++ b/Yi.Vue/src/views/AdmRoleMenu.vue
@@ -49,6 +49,18 @@ export default {
   created() {
  this.init();
   },
+watch: {
+     selectionRole:{
+         handler(val, oldVal){
+              if(val.length==1)
+              {
+                ////
+                this.selectionMenu=[{id:38},{id:39}]
+              }
+         },
+         deep:true
+     },
+  },
   methods: {
     setMenu(){
      var roleIds=[];
diff --git a/Yi.Vue/src/views/AdmUser.vue b/Yi.Vue/src/views/AdmUser.vue
index 531e79e8..620c6122 100644
--- a/Yi.Vue/src/views/AdmUser.vue
+++ b/Yi.Vue/src/views/AdmUser.vue
@@ -36,14 +36,13 @@ export default {
   methods: {
     async showItem(item) {
       var strInfo = "";
-
-roleApi.GetRolesByUser().then(resp=>{
-
-})
-
       Object.keys(item).forEach(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: "信息详情",