asd123a20 3 years ago
parent
commit
b5667558d7
3 changed files with 8 additions and 7 deletions
  1. 3 4
      app/service/column.js
  2. 3 1
      app/service/content.js
  3. 2 2
      app/service/page.js

+ 3 - 4
app/service/column.js

@@ -37,12 +37,11 @@ class ColumnService extends Service {
       // 当前数据
       const res = await model.findById(id);
       // 复杂查询文章数据
-      const contentList = await Contentmodel.where('columnList').in(res.code);
+      const contentList = await Contentmodel.find({ columns: res.code });
       contentList.filter(async p => {
-        const columnList = p.columnList.filter(e => e !== res.code);
-        await Contentmodel.findByIdAndUpdate(p._id, { columnList });
+        await Contentmodel.findById(p._id).update({ columns: '' });
       });
-      await model.findByIdAndDelete(id);
+      await model.findById(id).remove();
       return { errmsg: '', errcode: 0 };
     } catch (error) {
       throw new Error({ errcode: -2001, errmsg: '删除失败' });

+ 3 - 1
app/service/content.js

@@ -63,13 +63,15 @@ class ContentService extends Service {
     const { Content: model } = this.ctx.model;
     const filter = {};
     if (title) filter.title = title;
-    const total = await model.find();
+    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 };
       }
       let res;
+      total = await model.find({ ...filter });
       if (skip && limit) {
         res = await model.find({ ...filter }, { content: false }).skip(Number(skip) * Number(limit)).limit(Number(limit));
       } else {

+ 2 - 2
app/service/page.js

@@ -14,7 +14,7 @@ class PageService extends Service {
       let text = content.replace(new RegExp('</?[^>]+>', 'gm'), '');
       text = text.replace('\\s*|\t|\r|\n', '');
       const slug = text.substring(0, 200);
-      const menus = await model.find(menu);
+      const menus = await model.find({ menu });
       if (menus.length > 0) return { errmsg: '不能重复绑定菜单', errcode: -2001 };
       await model.create({ title, slug, date, annex, content, istop, menu, createAt, annexname });
       return { errmsg: '', errcode: 0 };
@@ -29,7 +29,7 @@ class PageService extends Service {
       let text = content.replace(new RegExp('</?[^>]+>', 'gm'), '');
       text = text.replace('\\s*|\t|\r|\n', '');
       const slug = text.substring(0, 200);
-      const menus = await model.find(menu);
+      const menus = await model.find({ menu });
       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 };