调整角色菜单绑定接口、添加角色授权菜单

service-naf/app/service/roleBindMenu.js

@@ -32,7 +32,7 @@ class RoleBindMenuService extends Service {
   }
   async queryBind({ skip, limit, roleCode, menuCode }) {
     const filter = {};
-    if (menuCode) filter.userId = menuCode;
+    if (menuCode) filter.menuCode = menuCode;
     if (roleCode) filter.roleCode = roleCode;
     try {
       const total = await this.model.find({ ...filter });
@@ -47,12 +47,12 @@ class RoleBindMenuService extends Service {
       throw error;
     }
   }
-  async batchBind({ roleCode, ids = [] }) {
+  async batchBind({ menuCode, ids = [] }) {
     try {
       const res = await Promise.all(
         ids.filter(async e => {
-          const bind = await this.model.findOne({ menuCode: e, roleCode });
-          if (!bind) await this.model.create({ menuCode: e, roleCode });
+          const bind = await this.model.findOne({ menuCode, roleCode: e });
+          if (!bind) await this.model.create({ menuCode, roleCode: e });
         })
       );
       return { errcode: 0, errmsg: '', data: res };
@@ -60,12 +60,12 @@ class RoleBindMenuService extends Service {
       throw error;
     }
   }
-  async batchUnBind({ roleCode, ids = [] }) {
+  async batchUnBind({ menuCode, ids = [] }) {
     try {
       const res = await Promise.all(
         ids.filter(async e => {
-          const bind = await this.model.findOne({ menuCode: e, roleCode });
-          if (bind) await this.model.deleteOne({ menuCode: e, roleCode });
+          const bind = await this.model.findOne({ menuCode, roleCode: e });
+          if (bind) await this.model.deleteOne({ menuCode, roleCode: e });
         })
       );
       return { errcode: 0, errmsg: '', data: res };

service-naf/config/menu.js

@@ -40,6 +40,14 @@ const data = [
     parentCode: 'gaf',
     icon: 'el-icon-star-on',
   },
+  {
+    module: 'roleMenu',
+    path: '/roleMenu/home',
+    title: '系统菜单',
+    code: 'roleMenu',
+    parentCode: 'gaf',
+    icon: 'el-icon-star-on',
+  },
   {
     module: 'log',
     path: '/log/home',