Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionOperation

modules/users/controllers/login_controller.js

@@ -143,6 +143,7 @@ class LoginController extends BaseController {
             } else {
                 // 获取数据库菜单列表
                 let menuPermissionList = await permissionModel.getList({isMenu:true});
+                let subList = [];
                 for (let menu of menuPermissionList) {
                     if (menu.pid === 0) {
                         menuData[menu.controller] = {
@@ -153,14 +154,18 @@ class LoginController extends BaseController {
                             children: {},
                         }
                     } else if (menu.pid !== 4) {
-                        let action = {
-                            title: menu.name,
-                            url: menu.url,
-                            name: menu.action,
-                        };
-                        menuData[menu.controller].children[menu.action] = action;
+                        subList.push(menu);//防止子节点ID比父节点ID小的问题
                     }
                 }
+                for(let s of subList){
+                    let action = {
+                     title: s.name,
+                     url: s.url,
+                     name: s.action,
+                     };
+                     menuData[s.controller].children[s.action] = action;
+                }
+
                 // 超级管理员二级菜单添加
                 menuData['manager'].children['admin'] = {
                     title: '超级管理员',

package.json

@@ -36,6 +36,7 @@
     "ueditor": "^1.2.3"
   },
   "scripts": {
-    "start": "C:\\Users\\mai\\AppData\\Roaming\\npm\\babel-node.cmd operation.js"
+    "start": "C:\\Users\\mai\\AppData\\Roaming\\npm\\babel-node.cmd operation.js",
+    "dev_server":"SET NODE_ENV=qa&& babel-node operation.js"
   }
 }