Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

@@ -50,7 +50,7 @@ func (dto *DepartmentUsersDto) LoadDto(dataType int, subDepartment *allied_creat
 		DepartmentName: "共创部门",
 		DepartmentName: "共创部门",
 		Users:          make([]User, 0),
 		Users:          make([]User, 0),
 	}
 	}
-
+	dto.Departments = append(dto.Departments, mapDepartment[-1])
 	for i := range subDepartment.Orgs {
 	for i := range subDepartment.Orgs {
 		org := subDepartment.Orgs[i]
 		org := subDepartment.Orgs[i]
 		dep := &Department{
 		dep := &Department{

@@ -70,6 +70,7 @@ func (rolesService *RolesService) RoleGet(roleGetQuery *query.RoleGetQuery) (int
 	}
 	}
 	relatedUser, err := creationUserGateway.RoleGetRelatedUser(allied_creation_user.ReqRoleGetRelatedUser{
 	relatedUser, err := creationUserGateway.RoleGetRelatedUser(allied_creation_user.ReqRoleGetRelatedUser{
 		RoleId: int64(roleId),
 		RoleId: int64(roleId),
+		OrgId:  roleGetQuery.Operator.OrgId,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())