update

controller/userController.js

@@ -52,6 +52,7 @@ async function login(req, res, next) {
         if (!user) {
             return res.sendError(errorMessage.loginError);
         }
+        //判断删除状态 ，暂时不加
         const check = utils.checkUserPassword({
             reqPw: password,
             salt: user.salt,
@@ -64,10 +65,10 @@ async function login(req, res, next) {
         let token = crypto.randomUUID();
         user.token = token.split('-').join("");
         let userStr = JSON.stringify(user);
-        console.log(userStr, "====")
         await ioRedis.set(`token:${user.token}`, userStr, 'EX', sysConfig.tokenEx);
         let ret = _.omit(user, ['password', 'salt']);
-        let menus = await userModule.getRoleMenus(ret.roles);
+
+        let menus = await userModule.getRoleMenus(ret.roles, user.mobile);
         ret.menus = menus;
         res.sendData(ret);
     } catch (error) {

module/userModule.js

@@ -11,10 +11,10 @@ async function findUserByMobile(mobile) {
     if (!mobile) {
         return null;
     }
-    const user = await DB.User.findOne({ mobile }).populate({path: "roles", select: "name key menus buttons", match: {del: {$ne: 1}}})
-    .populate({path: "depart", select: "name", match: {del: 0}})
-    .populate({path: "avatar"})
-    .lean().exec();//{ path: "roles depart avatar" }
+    const user = await DB.User.findOne({ mobile }).populate({ path: "roles", select: "name key menus buttons", match: { del: { $ne: 1 } } })
+        .populate({ path: "depart", select: "name", match: { del: 0 } })
+        .populate({ path: "avatar" })
+        .lean().exec();//{ path: "roles depart avatar" }
     return user;
 }
 
@@ -35,34 +35,37 @@ async function findOneAndUpdate(filter, updateObj) {
     return DB.User.findOneAndUpdate(filter, updateObj);
 }
 
-async function getRoleMenus(roles) {
-    let menuIds = [], buttonIds = [];
-    for (let index = 0; index < roles.length; index++) {
-        const element = roles[index];
-        element.menus = element.menus || [];
-        element.buttons = element.buttons || [];
-        menuIds = menuIds.concat(element.menus);
-        buttonIds = buttonIds.concat(element.buttons);
+async function getRoleMenus(roles, mobile) {
+    let menuIds = [], buttonIds = [], buts = [], mes = [];
+    if (mobile == "1111111111") {
+        buts = await DB.Menu.find({ del: 0 }).lean().exec();
+        mes = await DB.Menu.find({ del: 0, type: 1, enable: true }).populate({ path: "parentIds" }).lean().exec();
+    } else {
+        for (let index = 0; index < roles.length; index++) {
+            const element = roles[index];
+            element.menus = element.menus || [];
+            element.buttons = element.buttons || [];
+            menuIds = menuIds.concat(element.menus);
+            buttonIds = buttonIds.concat(element.buttons);
+        }
+        buts = await DB.Menu.find({ del: 0, _id: { $in: buttonIds } }).lean().exec();
+        mes = await DB.Menu.find({ del: 0, type: 1, enable: true, _id: { $in: menuIds } }).populate({ path: "parentIds" }).lean().exec();
     }
-    console.log(menuIds)
-    let buts = await DB.Menu.find({ del: 0, _id: { $in: buttonIds } }).lean().exec();
     // 把按钮的最近一级的父节点,作为map的key,按钮在下面放到对应的菜单中
     let bMap = {};
     for (let i = 0; i < buts.length; i++) {
         const o = buts[i];
-        o.permission = true; 
-        if(o.parentIds && o.parentIds.length > 0) {
+        o.permission = true;
+        if (o.parentIds && o.parentIds.length > 0) {
             let bpreId = o.parentIds.pop();
-            bMap[bpreId] = bMap[bpreId] || []; 
+            bMap[bpreId] = bMap[bpreId] || [];
             bMap[bpreId].push(o);
         }
 
-        
+
     }
-    
+
     //获取用户有效的菜单 type : 1
-    let mes = await DB.Menu.find({ del: 0, type: 1, enable: true, _id: { $in: menuIds } }).populate({ path: "parentIds" }).lean().exec();
-    console.log(mes)
     let nodes = [], nodeMap = {};
     for (let index = 0; index < mes.length; index++) {
         const element = mes[index];
@@ -84,7 +87,6 @@ async function getRoleMenus(roles) {
             nodeMap[element._id] = 1;
         }
     }
-    console.log(nodes, "================");
     let tree = utils.buildTree(nodes);
     return tree;
 }