1

controller/templateController.js

@@ -228,7 +228,7 @@ async function importExcelTempData(req, res, next) {
             for (let c = 0; c < sheetData[0].length; c++) {
                 // const formulaString = hf.getCellFormula({ sheet: 0, row: r, col: c });
                 let calculated =  hf.getCellValue({ sheet: 0, row: r, col: c });
-                // console.log( calculated, " === ")
+                console.log( calculated, " === ")
                 try {
                         const result = hf.calculateFormula("=" + calculated, 0)
                         // console.log(typeof result, "-----------------")

controller/userController.js

@@ -85,7 +85,7 @@ async function login(req, res, next) {
             delete element.menus;
             newRoles.push(element);
         }
-        menus = _.uniqBy(menus, 'id');
+        menus = _.filter(_.uniqBy(menus, 'id'), (o) => {return o.del == 0});
         user.roles = newRoles || [];
         // let allMenus = await DB.Menu.findAll({where: {del: 0}, raw: true});
         user.menus = utils.buildTree(menus);