From f2eda0ed7a12a4ce285e3b7583d1d4e604f8fb14 Mon Sep 17 00:00:00 2001 From: sriramv Date: Wed, 18 Aug 2021 12:15:55 +0530 Subject: [PATCH] merging --- app/controllers/financial.controller.js | 9 ++++++--- app/routes/routes.js | 3 --- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index bb8b3a0..c106c0d 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -21,11 +21,14 @@ exports.MenuList = async (req, res) => { attributes: ['id', 'section', 'is_active'], include :[{ association: 'subsectionsmasterData' , - //where :{is_active : 1} , + where :{is_active : 1} , attributes: ['id', 'subsection', 'is_active'], + required :false }], - required :true - }] + required :false + }], + required :false + }); const EntitiesData = await Entities.findAll({where : { losid } , attributes: ['id', 'losid' , 'pan' , 'cin' , 'bizname'] }); diff --git a/app/routes/routes.js b/app/routes/routes.js index 09720bf..6016385 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -29,9 +29,6 @@ module.exports = app => { //master.controller api's // get statment master data - - router.get("/StatmentsList", master.StatmentList); - /** * @openapi * /api/StatementsList: