no message

src/biz/officialWebsite.ts

@@ -43,8 +43,8 @@ export async function homePage() {
     let zhuanTiData = await find(TABLEENUM.专题系列, {});
     zhuanTiData.sort((a, b) => {return a.rank - b.rank});
     zhuanTiData.forEach(info => {
-        let {rank, title, articleUrl, imgUrl} = info;
-        result.zhuanTi.push({rank, title, articleUrl, imgUrl});
+        let {rank, title, articleUrl, imgUrl, articleTitle} = info;
+        result.zhuanTi.push({rank, title, articleUrl, imgUrl, id:articleTitle});
     });
     /**学会动态 每个动态资讯取最新的可见的两个*/
     let wenZhangTypeList = [ARTICLEPOSITION.动态资讯_hgh学会动态, ARTICLEPOSITION.动态资讯_hgh政策动向, ARTICLEPOSITION.动态资讯_hgh行业风采];
@@ -348,10 +348,10 @@ export async function zhuTiJiaoYu() {
         let itemId = info.id;
         dataInfo[info.name] = [];
         let findParam = {articleType:{"$in":[itemId]}, display:STATE.是};
-        let dataBaseList = await find(TABLEENUM.文章管理, findParam, ["title", "desc", "articleTime", "imgUrl"]);
+        let dataBaseList = await find(TABLEENUM.文章管理, findParam, ["id", "title", "desc", "articleTime", "imgUrl"]);
         dataBaseList.forEach(item => {
-            let {title, desc, articleTime, imgUrl} = item;
-            dataInfo[info.name].push({title, desc, articleTime, imgUrl});
+            let {id, title, desc, articleTime, imgUrl} = item;
+            dataInfo[info.name].push({id, title, desc, articleTime, imgUrl});
         });
     }
    
@@ -369,7 +369,7 @@ export async function xueXiYuanDiShiPin({type}) {
 
     let spDBList = await find(TABLEENUM.视频管理, {videoType:type, display:STATE.是});
     spDBList.forEach(info => {
-        let addInfo:any = extractData(info, ["title", "videoUrl", "videoTime"]);
+        let addInfo:any = extractData(info, ["id", "title", "videoUrl", "videoTime"]);
         addInfo.videoTime = moment(addInfo.videoTime).format("YYYY-MM-DD");
         dataList.push(addInfo);
     });
@@ -387,6 +387,7 @@ export async function xueXiYuanDiWenZi({type}) {
     let wzDBList = await find(TABLEENUM.文字资料, {type});
     wzDBList.forEach(info => {
         let addInfo:any = extractData(info, ["title", "rank", "imgUrl", "articleUrl", "updateTime"]);
+        addInfo.id = info.articleTitle
         addInfo.updateTime = moment(addInfo.updateTime).format("YYYY-MM-DD");
         dataList.push(addInfo);
     });
@@ -405,15 +406,15 @@ export async function dangJianZiYuan({first, secondary, three, pageNumber}) {
     let dataCount = 0;
     if (first == PARTYBUILDTYPEENUM.主题教育) {
         let findParam = {articleType:{"$in":[secondary]}, display:STATE.是};
-        let dataBaseList = await findToPage(TABLEENUM.文章管理, findParam, ["title", "desc", "articleTime", "imgUrl"], pageNumber);
+        let dataBaseList = await findToPage(TABLEENUM.文章管理, findParam, ["id", "title", "desc", "articleTime", "imgUrl"], pageNumber);
         dataCount = await findCount(TABLEENUM.文章管理, findParam);
         dataBaseList.forEach(item => {
-            let {title, desc, articleTime, imgUrl} = item;
-            dataList.push({title, desc, articleTime, imgUrl});
+            let {title, desc, articleTime, imgUrl, id} = item;
+            dataList.push({id, title, desc, articleTime, imgUrl});
         });
     } else {//学习园地
         if (secondary == PARTYBUILDSUBTYPEENUM.文字资料) {
-            let wzDBList = await findToPage(TABLEENUM.文字资料, {type:three}, ["title", "rank", "imgUrl", "articleUrl", "updateTime"], pageNumber);
+            let wzDBList = await findToPage(TABLEENUM.文字资料, {type:three}, [ "title", "rank", "imgUrl", "articleUrl", "updateTime"], pageNumber);
             dataCount = await findCount(TABLEENUM.文字资料, {type:three});
             wzDBList.forEach(info => {
                 let addInfo:any = extractData(info, ["title", "rank", "imgUrl", "articleUrl", "updateTime"]);

src/biz/portal/xueHui/xueHuiLingDao.ts

@@ -3,6 +3,7 @@
  * 排序，后一个排序会与修改前的排序互换
  */
 
+import { XUEHUILINGDAOZHIWEI } from "../../../config/enum";
 import { ERRORENUM } from "../../../config/errorEnum";
 import { addOneData } from "../../../data/add";
 import { deleteOneData } from "../../../data/delete";
@@ -12,6 +13,7 @@ import { updateOneData } from "../../../data/update";
 import { generateSystemId, successResult } from "../../../tools/system";
 import { BizError } from "../../../util/bizError";
 import { extractData } from "../../../util/piecemeal";
+import { changeEnumValue } from "../../../util/verificationEnum";
 
 
 /**
@@ -72,7 +74,8 @@ export async function list({pageNumber}) {
     let dataCount = await findCount(TABLEENUM.活动通知, {});
     let dataList = [];
     dbList.forEach(info => {
-        let item = extractData(info, ["id", "rank", "name", "position", "desc"]);
+        let item:any = extractData(info, ["id", "rank", "name", "position", "desc"]);
+        item.position = changeEnumValue(XUEHUILINGDAOZHIWEI, info.position);
         dataList.push(item);
     });
 

src/config/enum.ts

@@ -95,18 +95,17 @@ export enum PROFCATEGORY {
 
 
 /**
- * 作品类型
+ * 学会领导职位
  */
-export enum TYPEOFWORKS {
-    作品类型1 = 1,
-    作品类型2,
-    作品类型3,
-    作品类型4,
-    作品类型5,
-    作品类型6
+export enum XUEHUILINGDAOZHIWEI {
+    会长 = 1,
+    副会长,
+    秘书长,
+    监事长
 }
 
 
+
 /**
  * 内容管理banner位置
  */

src/data/models/model.ts

@@ -109,7 +109,7 @@ const ModelArray = [
             id:{ type:'String', index:true },
             rank:{ type:'Number' },//排序
             name:{ type:'String', default:'' },//名称
-            position:{ type:'String', default:'' },//职位
+            position:{ type:'Number', default:'' },//职位
             imgUrl:{ type:'String', default:''},//大图地址
             miniImgUrl:{ type:'String', default:'' },//小图片地址
             desc:{ type:'String', default:'' },//描述

src/routers/portal/router.ts

@@ -72,7 +72,7 @@ export const Config = {
                     {
                         rank:{type:"Number", desc:"排序"},
                         name:{typs:"String", desc:"名称"},
-                        position:{type:"String", desc:"职位"},
+                        position:{type:"Number", desc:"职位"},
                         imgUrl:{type:"String", desc:"大图地址"},
                         miniImgUrl:{type:"String", desc:"小图地址"},
                         desc:{type:"String", desc:"说明"},
@@ -90,7 +90,7 @@ export const Config = {
                     {
                         rank:{type:"Number", desc:"排序"},
                         name:{typs:"String", desc:"名称"},
-                        position:{type:"String", desc:"职位"},
+                        position:{type:"Number", desc:"职位"},
                         imgUrl:{type:"String", desc:"大图地址"},
                         miniImgUrl:{type:"String", desc:"小图地址"},
                         desc:{type:"String", desc:"说明"},

src/routers/public/router.ts

@@ -54,13 +54,6 @@ export const Config = {
             bindBiz:publicBiz.setEnumInterface
         },
         {
-            apiName:"作品类型",
-            subUrl:'/typeofworks', 
-            param:[],
-            defaultParam:enumConfig.TYPEOFWORKS,
-            bindBiz:publicBiz.setEnumInterface
-        },
-        {
             apiName:"参会人员",
             subUrl:'/codparticipant', 
             param:[],
@@ -218,6 +211,14 @@ export const Config = {
             param:[],
             defaultParam:enumConfig.BANXUELEIXING,
             bindBiz:publicBiz.setEnumInterface
+        },
+        {
+            apiName:"学会领导职务",
+            subUrl:'/xuehuilingdaolv',
+            param:[],
+            defaultParam:enumConfig.XUEHUILINGDAOZHIWEI,
+            bindBiz:publicBiz.setEnumInterface
+            
         }
     ],
 }