LOG日志

app/controller/noticeController.js

@@ -7,7 +7,7 @@ class NoticeController extends Controller {
     return this.ctx.service.noticeService;
   }
 
-
+//我发布的通知
   async listForPage() {
     const { ctx } = this;
     const user = ctx.user;
@@ -24,13 +24,18 @@ class NoticeController extends Controller {
       ctx.query.title ={$regex: ctx.query.searchtitle}
       delete ctx.query.searchtitle;
     }
-    ctx.logger.info(user.role._id);
-    ctx.logger.info(user.role._id != this.app.config.defaultAdminRoleId);
-    ctx.logger.info(ctx.query);
     const result = await this.tag().listForPage(ctx.query);
     ctx.success(result);
   }
 
+  //PC端发给我的通知
+  async pcListForPage() {
+    const { ctx ,service} = this;
+    const user = ctx.user;
+    const result = await service.noticeService.pcListForPage(ctx.query,user);
+    ctx.success(result);
+  }
+
   // 已读接口
   async listForApplets() {
     const { ctx, service } = this;

app/router/applets.js

@@ -49,6 +49,7 @@ module.exports = app => {
   router.get('/appletNotice/listForApplets', controller.noticeController.listForApplets);
   router.get('/appletNotice/listForAppletsNoread', controller.noticeController.listForAppletsNoread);
   router.get('/appletNotice/listForAppletsFirst', controller.noticeController.listForAppletsFirst);
+  router.get('/appletNotice/pcListForPage', controller.noticeController.pcListForPage);
 
 
   // 通知中间表

app/service/noticeService.js

@@ -17,6 +17,36 @@ class NoticeService extends Service {
     return await model.NoticeModel.find(data, pop).sort({ createTime: -1 }).skip(0).limit(1);
   }
 
+  // PC端发给我的通知
+  async pcListForPage(data,user) {
+    const { model } = this.ctx;
+    const page = data.page;
+    const rows = Number.parseInt(data.rows) || this.app.config.defaultPageSize;
+    delete data.page;
+    delete data.rows;
+
+    const where = {};
+
+    if (!data.searchtitle) {
+      delete data.searchtitle;
+    }else{
+      where.title ={$regex: data.searchtitle}
+      delete data.searchtitle;
+    }
+
+    where.$or = [{ deptId: user.dept1._id }, { deptId: user.dept2._id }, { deptId: user.dept3._id }];
+
+
+    const total = await model.InfoModel.find(where).countDocuments();
+    const result = await model.InfoModel.find(where).skip((page - 1) * rows)
+        .limit(rows)
+        .sort({ createTime: -1 });
+    return {
+      count: total,
+      list: result,
+    };
+  }
+
 }
 
 module.exports = NoticeService;