Merge branch 'test' of http://gitlab.fjmaimaimai.com/allied-creation/allied-crea…

…tion-gateway into test

@@ -139,9 +139,9 @@ func (rolesService *RolesService) RoleMenuBeforeEdit(roleMenuBeforeEditQuery *qu
 		roleMenuBeforeEditQuery.Operator)
 	roleId, _ := strconv.Atoi(roleMenuBeforeEditQuery.RoleId)
 	roles, err := creationUserGateway.RoleSearch(allied_creation_user.ReqRoleSearch{
-		OrgId:    roleMenuBeforeEditQuery.Operator.OrgId,
-		Limit:    999,
-		RoleType: 1,
+		CompanyId: roleMenuBeforeEditQuery.Operator.CompanyId,
+		Limit:     999,
+		RoleType:  1,
 	})
 	if err != nil {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())

@@ -33,6 +33,8 @@ type (
 		RoleName string `json:"roleName"`
 		// 组织ID
 		OrgId int64 `json:"orgId"`
+		// 企业id
+		CompanyId int64 `cname:"企业id" json:"companyId"`
 		// 匹配多个组织
 		InOrgIds []int64 `cname:"匹配多个组织" json:"inOrgIds,omitempty"`
 		// 角色名称