Browse Source

melhorias

diogenes 2 years ago
parent
commit
bd8256d3a1
2 changed files with 4 additions and 4 deletions
  1. 1 1
      src/controllers/Telefonia.Controller.js
  2. 3 3
      src/models/Ramais.model.js

+ 1 - 1
src/controllers/Telefonia.Controller.js

@@ -45,7 +45,7 @@ module.exports = {
       .orWhere("ramais.id", "like", `%${busca}%`)
       .orWhere("ramais.id", "like", `%${busca}%`)
       .orWhere("ramais.nome", "like", `%${busca}%`)
       .orWhere("ramais.nome", "like", `%${busca}%`)
       .orWhere("ramais.ramal", "like", `%${busca}%`)
       .orWhere("ramais.ramal", "like", `%${busca}%`)
-      .orWhere("did.numero", "like", `%${busca}%`).limit(100);
+      .orWhere("did.numero", "like", `%${busca}%`).groupBy('ramais.id').limit(100);
 
 
     // Execute a consulta e envie a resposta quando terminar
     // Execute a consulta e envie a resposta quando terminar
     try {
     try {

+ 3 - 3
src/models/Ramais.model.js

@@ -27,10 +27,10 @@ class Ramais extends unique(Model) {
         join: {
         join: {
           from: "did.id_ramal",
           from: "did.id_ramal",
           to: "ramais.id",
           to: "ramais.id",
-        },
+        }
       },
       },
       plano_franquia: {
       plano_franquia: {
-        relation: Model.HasManyRelation,
+        relation: Model.BelongsToOneRelation,
         modelClass: Franquia,
         modelClass: Franquia,
         join: {
         join: {
           from: "franquias.id_planos",
           from: "franquias.id_planos",
@@ -39,7 +39,7 @@ class Ramais extends unique(Model) {
         
         
       },
       },
       ramais_franquias: {
       ramais_franquias: {
-        relation: Model.HasManyRelation,
+        relation: Model.BelongsToOneRelation,
         modelClass: RamalFranquias,
         modelClass: RamalFranquias,
         join: {
         join: {
           from: "ramais.id",
           from: "ramais.id",