Merge remote-tracking branch 'upstream/master'

src/dashoo.cn/backend/api/controllers/casbin/user.go

@@ -96,7 +96,7 @@ func (this *UserController) GetUserModuleTree() {
 // @router /getuserrole/:id [get]
 func (this *UserController) UserPowerCheckRole() {
 	userid := this.Ctx.Input.Param(":id")
-	roleofuser := utils.RBAC.GetRolesForUser("uid_" + userid)
+	roleofuser := utils.RBAC.GetRolesForUserInDomain("uid_"+userid, utils.DOMAIN)
 	for i := 0; i < len(roleofuser); i++ {
 		roleofuser[i] = strings.Replace(roleofuser[i], "rid_", "", 1)
 	}

src/dashoo.cn/frontend_web/src/pages/system/users.vue

@@ -316,8 +316,9 @@
         this.selectedrole = []
         let _this = this
         // request
-        this.$axios.get('casb/users/getuserrole/' + this.selecteduserid, {})
+        this.$axios.get('users/getuserrole/' + this.selecteduserid, {})
           .then(res => {
+            console.log("-------res----",res.data)
             _this.mustrolelist = []
             // response
             for (let i = 0; i < res.data.length; i++) {