Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer

src/biz/officialWebsite.ts

@@ -84,15 +84,16 @@ export async function homePage() {
     //     });
     // });
 
-    let huoDongTongZhiDataFindParam = {articleType:{"$in":[ARTICLEPOSITION.通知公告_hgh活动通知]}, display:STATE.是};
-    let huoDongTongZhiDataList = await findToSortToPage(TABLEENUM.文章管理, huoDongTongZhiDataFindParam, ["articleTime", "id", "title"], {articleTime:-1}, 1);
+    let huoDongTongZhiDataFindParam = {articleType:{"$in":[ARTICLEPOSITION.通知公告_hgh活动通知, ARTICLEPOSITION.通知公告_hgh会议通知, ARTICLEPOSITION.通知公告_hgh项目公告]}, display:STATE.是};
+    let huoDongTongZhiDataList = await findToSortToPage(TABLEENUM.文章管理, huoDongTongZhiDataFindParam, ["articleTime", "id", "title", "articleType"], {articleTime:-1}, 1);
     huoDongTongZhiDataList.forEach(info => {
-        let { id, title, articleTime } = info;
+        let { id, title, articleTime, articleType } = info;
         result.huoDongTongZhi.push({
-            id, title, articleTime:moment(articleTime).format("YYYY-MM-DD")
+            id, title, articleTime:moment(articleTime).format("YYYY-MM-DD"), value:articleType[0]
         });
     });
 
+
     /**热点视频*/
     let reDianShiPinData = await find(TABLEENUM.视频管理, { display:STATE.是 } );
     reDianShiPinData.sort((a, b) => {return a.videoTime - b.videoTime});