modules/client/back/methods/client/filter.js

@@ -145,16 +145,18 @@ module.exports = Self => {
                     c.name,
                     c.fi,
                     c.socialName,
-                    CONCAT(c.phone, ',',GROUP_CONCAT(DISTINCT a.phone)) phone,
+                    c.phone,
+                    a.phone,
                     c.mobile,
-                    CONCAT(c.city, ',',GROUP_CONCAT(DISTINCT a.city)) city,
+                    c.city,
+                    a.city,
                     c.postcode,
                     a.postalCode,
                     c.email,
                     c.isActive,
                     c.isFreezed,
-                    p.id AS provinceFk2,
-                    a.provinceFk,
+                    p.id AS provinceClientFk,
+                    a.provinceFk AS provinceAddressFk,
                     p.name AS province,
                     u.id AS salesPersonFk,
                     u.name AS salesPerson

modules/client/back/methods/client/specs/filter.spec.js

@@ -146,7 +146,7 @@ describe('client filter()', () => {
             const randomResultClient = result[randomIndex];
 
             expect(result.length).toBeGreaterThanOrEqual(20);
-            expect(randomResultClient.city.toLowerCase()).toEqual('gotham,gotham');
+            expect(randomResultClient.city.toLowerCase()).toEqual('gotham');
 
             await tx.rollback();
         } catch (e) {