no message

src/biz/applet/base.ts

@@ -15,7 +15,7 @@ import moment = require('moment');
 /**
  * 主页基础数据
  */
-export async function homeData() {
+export async function homeData(uId:number) {
     let partyMemberNum = await partyMemberData.groupFindPartyMemberCount({}); //党员总数
     let massIndex = 87.6; //党建指令指数
 

src/biz/applet/partyMember/organizationalLife.ts

@@ -30,6 +30,13 @@ export async function getOrganizationalLifeList(type:number, name:number) {
 
     let data = [];
 
+    const NowMs = new Date().valueOf();
+    let selectParam = {};
+    if (type != configEnum.TYPE.全部) {
+        if (type == configEnum.TYPE.即将开展) selectParam = {"activityStartTime":{"$gt":NowMs }};
+        else if (type == configEnum.TYPE.已经开展) selectParam = {"activityEndTime":{"$lt":NowMs }}; 
+    }
+
     switch (type) {
         case configEnum.TYPE.正在进行:
             moveAboutList = await organizationalLifeData.findAfootActivityList(name);

src/config/enum.ts

@@ -13,14 +13,14 @@ export enum PARTYPOSITIONS {
     预备党员,
 }
 
-
 /**
  * 组织生活活动类型
  */
 export enum TYPE {
     正在进行 = 1,
     即将开展,
-    已经开展
+    已经开展,
+    全部
 }
 
 

src/routers/applet/base.ts

@@ -18,7 +18,8 @@ export function setRouter(httpServer) {
  * @param res 
  */
 async function homeBase(req, res) {
-    let baseInfo = await baseBiz.homeData();
+    let uId = req.headers.userid;
+    let baseInfo = await baseBiz.homeData(uId);
     res.success(baseInfo);
 }