Browse Source

添加菜单排序 登录异常

asd123a20 3 years ago
parent
commit
ca427e05b3
4 changed files with 22 additions and 7 deletions
  1. 9 0
      app/model/Menu.js
  2. 0 1
      app/service/log.js
  3. 9 6
      app/service/menu.js
  4. 4 0
      app/service/power.js

+ 9 - 0
app/model/Menu.js

@@ -27,6 +27,15 @@ module.exports = app => {
     en: {
       type: String,
     },
+    sort: {
+      type: Number,
+    },
+    columnList: {
+      type: Array,
+    },
+    pages: {
+      type: String,
+    },
   });
   return mongoose.model('Menu', MenuSchema);
 };

+ 0 - 1
app/service/log.js

@@ -18,7 +18,6 @@ class LogService extends Service {
       await model.create({ data, method, createAt, mondel, result, userName, acct, date });
       return { errmsg: '', errcode: 0 };
     } catch (error) {
-      console.log(error);
       throw new Error({ errcode: -2001, errmsg: '添加失败' });
     }
   }

+ 9 - 6
app/service/menu.js

@@ -4,28 +4,29 @@ const Service = require('egg').Service;
 const assert = require('assert');
 const moment = require('moment');
 class MenuService extends Service {
-  async create({ name, code, state, type, uri, en }) {
+  async create({ name, code, state, type, uri, en, sort }) {
     assert(name, '名称不存在');
     assert(code, '编码不存在');
     assert(state, '状态不存在');
     assert(type, '类型不存在');
     assert(en, '英文缩写不存在');
+    assert(sort, '排序不存在');
     const { Menu: model } = this.ctx.model;
     const createAt = moment().format('x');
     try {
       const isdata = await model.find({ code });
       if (isdata.length > 0) return { errmsg: '编码已存在', errcode: -2001 };
-      await model.create({ name, code, createAt, state, type, uri, en });
+      await model.create({ name, code, createAt, state, type, uri, en, sort: Number(sort) });
       return { errmsg: '', errcode: 0 };
     } catch (error) {
       throw new Error({ errcode: -2001, errmsg: '添加失败' });
     }
   }
-  async update({ name, state, _id, uri, en }) {
+  async update({ name, state, _id, uri, en, sort }) {
     assert(_id, 'id不存在');
     const { Menu: model } = this.ctx.model;
     try {
-      await model.findById(_id).update({ name, state, uri, en });
+      await model.findById(_id).update({ name, state, uri, en, sort: Number(sort) });
       return { errmsg: '', errcode: 0 };
     } catch (error) {
       throw new Error({ errcode: -2001, errmsg: '修改失败' });
@@ -80,6 +81,7 @@ class MenuService extends Service {
       throw new Error({ errcode: -2001, errmsg: '删除失败' });
     }
   }
+  // 新增排序
   async query({ skip, limit, name, code, type }) {
     const { Menu: model } = this.ctx.model;
     try {
@@ -90,9 +92,10 @@ class MenuService extends Service {
       const total = await model.find({ ...filter });
       let res;
       if (skip !== undefined && limit !== undefined) {
-        res = await model.find({ ...filter }).skip(Number(skip) * Number(limit)).limit(Number(limit));
+        res = await model.find({ ...filter }).skip(Number(skip) * Number(limit)).limit(Number(limit))
+          .sort({ sort: 1 });
       } else {
-        res = await model.find({ ...filter });
+        res = await model.find({ ...filter }).sort({ sort: 1 });
       }
       return { errmsg: '', errcode: 0, data: res, total: total.length };
     } catch (error) {

+ 4 - 0
app/service/power.js

@@ -13,6 +13,9 @@ class UserService extends Service {
     const pwd = hash.update(password).digest('hex');
     try {
       const res = await model.find({ acct });
+      if (res.length <= 0) {
+        return { errmsg: '用户不存在', errcode: -2003 };
+      }
       const userInfo = res[0];
       if (userInfo.state !== '0') {
         return { errmsg: '用户状态异常', errcode: -2003 };
@@ -23,6 +26,7 @@ class UserService extends Service {
       const token = this.app.jwt.sign({ acct: userInfo.acct, userName: userInfo.userName, id: userInfo._id }, this.app.config.jwt.secret);
       return { errmsg: '', errcode: 0, token, userInfo: { acct: userInfo.acct, userName: userInfo.userName, id: userInfo._id } };
     } catch (error) {
+      console.log(error);
       throw new Error({ errcode: -2001, errmsg: '登录失败' });
     }
   }