Commit f5e326d8 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Fix : Recherche des organisations (trop de résultats)

parent 2cfb3425

module/Oscar/src/Oscar/Service/OrganizationService.php

+2 −1
Original line number Diff line number Diff line
@@ -395,10 +395,11 @@ class OrganizationService implements UseOscarConfigurationService, UseEntityMana 


        if( $search != "" ){

            $ids = $this->search($search, true);

           // var_dump($ids); die();

            $qb->where('o.id IN(:ids)')->setParameter('ids', $ids);

        }



        $qb->addOrderBy('o.dateEnd', 'DESC')->addOrderBy('o.dateUpdated', 'DESC');

        //$qb->addOrderBy('o.dateEnd', 'DESC')->addOrderBy('o.dateUpdated', 'DESC');



        // -------------------------------------------------------------------------------------------------------------

        // FILTRE sur les types d'organisations

module/Oscar/src/Oscar/Strategy/Search/OrganizationElasticSearch.php

+2 −1
Original line number Diff line number Diff line
@@ -193,8 +193,9 @@ class OrganizationElasticSearch implements OrganizationSearchStrategy 
                'size' => 10000,

                'query' => [

                    'query_string' => [

                        'fields' => ['code^5', 'shortname^5', 'fullname^5', 'email', 'city', 'siret', 'country', 'connectors', 'zipcode', 'persons^3', 'activities'],

                        'fields' => [ 'code','shortname^7', 'fullname^9','email', 'city', 'siret', 'country', 'connectors', 'zipcode', 'persons'],

                        'query' => $search,

                        'use_dis_max' => true

                    ]

                ]

            ]