作者 tangxvhui

bug修复

1 package rbac 1 package rbac
2 2
3 import ( 3 import (
  4 + "fmt"
4 "oppmg/common/log" 5 "oppmg/common/log"
5 "oppmg/models" 6 "oppmg/models"
6 "oppmg/protocol" 7 "oppmg/protocol"
@@ -41,6 +42,7 @@ func GetRoleHasMenu(roleid int64, companyid int64) (*protocol.ResponseRoleMenus, @@ -41,6 +42,7 @@ func GetRoleHasMenu(roleid int64, companyid int64) (*protocol.ResponseRoleMenus,
41 return nil, protocol.NewErrWithMessage("1") 42 return nil, protocol.NewErrWithMessage("1")
42 } 43 }
43 if roleData.CompanyId != companyid { 44 if roleData.CompanyId != companyid {
  45 + fmt.Println(roleData.CompanyId, companyid)
44 log.Error("角色的公司id不匹配") 46 log.Error("角色的公司id不匹配")
45 return nil, protocol.NewErrWithMessage("1") 47 return nil, protocol.NewErrWithMessage("1")
46 } 48 }
@@ -106,7 +108,7 @@ func GetRoleHasMenuAll(roleid int64, companyid int64) (map[string]PermissionCont @@ -106,7 +108,7 @@ func GetRoleHasMenuAll(roleid int64, companyid int64) (map[string]PermissionCont
106 } 108 }
107 109
108 func RoleMenuEdit(companyid int64, roleId int64, menuids []int64) error { 110 func RoleMenuEdit(companyid int64, roleId int64, menuids []int64) error {
109 - roleMenus, err := GetRoleHasMenu(companyid, roleId) 111 + roleMenus, err := GetRoleHasMenu(roleId, companyid)
110 if err != nil { 112 if err != nil {
111 return err 113 return err
112 } 114 }