diff --git a/src/libs/routes/siope.js b/src/libs/routes/siope.js index 1b1c53727639d7348582b0744d372393ef386c31..622da904d074ff80b1d328bcada59ad23eb317ec 100644 --- a/src/libs/routes/siope.js +++ b/src/libs/routes/siope.js @@ -46,7 +46,7 @@ siopeApp.get('/years', (req, res, next) => { rqf.addField({ name: 'filter', - field: false, + field: true, where: true }).addField({ name: 'dims', @@ -71,8 +71,8 @@ rqf.addField({ }).addValue({ name: 'state', table: 'estado', - tableField: 'nome', - resultField: 'state_name', + tableField: ['id','nome','sigla'], + resultField: ['state_id','state_name','state_abbreviation'], where: { relation: '=', type: 'integer', @@ -149,15 +149,14 @@ siopeApp.get('/', rqf.parse(), (req, res, next) => { next(); }, rqf.multibuild(), multiQuery, (req, res, next) => { - let result = {} - if ('state' in req.filter) { - req.result[req.queryIndex.siopeUf].forEach((item) => { - let keys = Object.keys(item); - keys.forEach((key) => { - result[key] = item[key]; - }); - }); - } + let result = [] + + req.result[req.queryIndex.siopeUf].forEach((item) => { + result.push(item) + }); + req.result[req.queryIndex.siopeMun].forEach((item) => { + result.push(item) + }); req.result = result; next();