diff --git a/src/products/products.module.ts b/src/products/products.module.ts index c1b23b3..e49a3f9 100644 --- a/src/products/products.module.ts +++ b/src/products/products.module.ts @@ -288,18 +288,29 @@ export default moduleFactory DIN_ABASTECIMENTO_PRODUTOS p WHERE 1 = 1 - AND p.SEQPRODUTO LIKE '%' || ${args.filtro} || '%' + AND ( + ( + ${args.filtro} IS NOT NULL + AND ( + p.SEQPRODUTO LIKE '%' || ${args.filtro} || '%' OR UPPER(p.DESCCOMPLETA) LIKE UPPER('%' || ${args.filtro} || '%') - OR EXISTS ( - SELECT - 1 - FROM - CONSINCO.MAP_PRODCODIGO A - WHERE - A.SEQPRODUTO = p.SEQPRODUTO + ) + ) + OR ( + ${args.ean} IS NOT NULL + AND EXISTS ( + SELECT 1 + FROM CONSINCO.MAP_PRODCODIGO A + WHERE A.SEQPRODUTO = p.SEQPRODUTO AND ISNUMERIC(A.CODACESSO) = 'S' AND A.CODACESSO = ${args.ean} ) + ) + OR ( + ${args.filtro} IS NULL + AND ${args.ean} IS NULL + ) + ) ORDER BY 2 `,