app/service/adminUser.js

@@ -71,7 +71,7 @@ class adminUserService extends Service {
     if (acct) filter.acct = acct;
     try {
       let res;
-      const total = await model.find();
+      const total = await model.find({ ...filter });
       if (skip && limit) {
         res = await model.find({ ...filter }, { password: false }).skip(Number(skip) * Number(limit)).limit(Number(limit));
       } else {

app/service/banner.js

@@ -58,7 +58,7 @@ class ContentService extends Service {
     const { Banner: model } = this.ctx.model;
     const filter = {};
     if (title) filter.title = title;
-    const total = await model.find();
+    const total = await model.find({ ...filter });
     try {
       let res;
       if (skip && limit) {

app/service/column.js

@@ -11,7 +11,7 @@ class ColumnService extends Service {
     const { Column: model } = this.ctx.model;
     const createAt = moment().format('x');
     try {
-      const isdata = model.find(code);
+      const isdata = await model.find({ code });
       if (isdata.length > 0) return { errmsg: '编码已存在', errcode: -2001 };
       await model.create({ name, code, menuList, createAt });
       return { errmsg: '', errcode: 0 };

app/service/content.js

@@ -63,13 +63,14 @@ class ContentService extends Service {
     const { Content: model } = this.ctx.model;
     const filter = {};
     if (title) filter.title = title;
+    if (columns) filter.columns = columns;
     let total = 0;
     try {
-      if (columns) {
-        total = await model.find({ columns });
-        const list = await model.find({ columns }).skip(Number(skip) * Number(limit)).limit(Number(limit));
-        return { errmsg: '', errcode: 0, data: list, total: total.length };
-      }
+      // if (columns) {
+      //   total = await model.find({ columns });
+      //   const list = await model.find({ columns }).skip(Number(skip) * Number(limit)).limit(Number(limit));
+      //   return { errmsg: '', errcode: 0, data: list, total: total.length };
+      // }
       let res;
       total = await model.find({ ...filter });
       if (skip && limit) {

app/service/link.js

@@ -44,7 +44,7 @@ class LinkService extends Service {
       const filter = {};
       if (name) filter.title = name;
       let res;
-      const total = await model.find();
+      const total = await model.find({ ...filter });
       if (skip && limit) {
         res = await model.find({ ...filter }).skip(Number(skip) * Number(limit)).limit(Number(limit));
       } else {

app/service/menu.js

@@ -13,7 +13,7 @@ class MenuService extends Service {
     const { Menu: model } = this.ctx.model;
     const createAt = moment().format('x');
     try {
-      const isdata = model.find(code);
+      const isdata = await model.find({ code });
       if (isdata.length > 0) return { errmsg: '编码已存在', errcode: -2001 };
       await model.create({ name, code, createAt, state, type, uri, en });
       return { errmsg: '', errcode: 0 };
@@ -83,11 +83,11 @@ class MenuService extends Service {
   async query({ skip, limit, name, code, type }) {
     const { Menu: model } = this.ctx.model;
     try {
-      const total = await model.find();
       const filter = {};
       if (name) filter.name = name;
       if (code) filter.code = code;
       if (type) filter.type = type;
+      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));

app/service/page.js

@@ -30,7 +30,8 @@ class PageService extends Service {
       text = text.replace('\\s*|\t|\r|\n', '');
       const slug = text.substring(0, 200);
       const menus = await model.find({ menu });
-      if (menus.length > 0 && menus[0]._id !== _id) return { errmsg: '不能重复绑定菜单', errcode: -2001 };
+      // eslint-disable-next-line eqeqeq
+      if (menus.length > 0 && menus[0]._id != _id) return { errmsg: '不能重复绑定菜单', errcode: -2001 };
       await model.findById(_id).update({ title, date, slug, annex, content, istop, menu, annexname });
       return { errmsg: '', errcode: 0 };
     } catch (error) {
@@ -72,7 +73,7 @@ class PageService extends Service {
     const filter = {};
     if (title) filter.title = title;
     try {
-      const total = await model.find();
+      const total = await model.find({ ...filter });
       let res;
       if (skip && limit) {
         res = await model.find({ ...filter }, { content: false }).skip(Number(skip) * Number(limit)).limit(Number(limit));

app/service/role.js

@@ -54,11 +54,11 @@ class RoleService extends Service {
   async query({ skip, limit, name, code, state }) {
     const { Role: model } = this.ctx.model;
     const filter = {};
-    if (name) filter.userName = name;
+    if (name) filter.name = name;
     if (code) filter.state = code;
     if (state) filter.acct = state;
     try {
-      const total = await model.find();
+      const total = await model.find({ ...filter });
       let res;
       if (skip && limit) {
         res = await model.find({ ...filter }).skip(Number(skip) * Number(limit)).limit(Number(limit));