同步

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>

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'
+        })
     }
 }

Yi.Vue/src/components/ccTreeview.vue

@@ -116,6 +116,7 @@ export default {
           position: "top-right",
           timeout: 5000,
         });
+               this.init();
       });
     },
 

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=[];

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: "信息详情",