no message

src/biz/officialWebsite.ts

@@ -696,7 +696,7 @@ export async function weiYuanMingDanList({name, agencyId, pageNumber, pageSize})
     let selectParam:any = {agencyId};
     if (name) selectParam.name = {"$regex":name};
     let dataList = [];
-    let dbList = await findToSortToPage(TABLEENUM.委员名单, selectParam, ["name", "branchDuties", "unit", "unitDuties"], {branchDuties:1}, pageNumber, pageSize);
+    let dbList = await findToSortToPage(TABLEENUM.委员名单, selectParam, ["name", "branchDuties", "unit", "unitDuties"], {branchDuties:-1, ut:-1}, pageNumber, pageSize);
     let dataCount = await findCount(TABLEENUM.委员名单, selectParam);
     dbList.forEach(info => {
         let addInfo:any = extractData(info, ["name", "unit", "unitDuties"]);

src/biz/portal/fenZhiJiGou/weiYuanMingDan.ts

@@ -24,6 +24,8 @@ import { changeEnumValue } from "../../../util/verificationEnum";
 export async function create({userId, agencyId, form}) { 
     form.id = generateSystemId(TABLEENUM.委员名单, userId);
     form.agencyId = agencyId;
+    form.branchDuties.sort();
+    form.ut = new Date().valueOf();
     await addOneData(TABLEENUM.委员名单, form);
 
     return successResult();
@@ -43,6 +45,8 @@ export async function update({userId, id, form}) {
     if (form.agencyId) {
         delete form.agencyId;
     }
+    form.branchDuties.sort();
+    form.ut = new Date().valueOf();
     await updateOneData(TABLEENUM.委员名单, {id}, form);
     return successResult();
 }

src/config/enum.ts

@@ -289,10 +289,13 @@ export enum CODPARTICIPANT {
  * 分会职务
  */
 export enum BRANCHPOSITION {
-    主任 = 1,
+    名誉主任 = 1,
+    主任,
+    常务副主任,
     副主任,
     秘书长,
     副秘书长,
+    常务委员,
     委员
 }
   

src/data/models/model.ts

@@ -311,10 +311,11 @@ const ModelArray = [
             id:{type:'String', index:true },
             agencyId:{type:'String', index:true},//机构id
             name:'String',//姓名
-            branchDuties:'Number',//分会职务
+            branchDuties:'[Number]',//分会职务
             unit:'String',//单位
             unitDuties:'String',//单位职务
-            ct:'Number'
+            ct:'Number',
+            ut:'Number',//修改时间
         }
     },
     {

src/routers/portal/router.ts

@@ -1041,7 +1041,7 @@ export const Config = {
                 {key:"form", type:"Object", sub:
                     {
                         name:{type:'String', desc:"姓名"},
-                        branchDuties:{type:'Number', desc:"分会职务"},
+                        branchDuties:{type:'[Number]', desc:"分会职务"},
                         unit:{type:'String', desc:"单位"},
                         unitDuties:{type:'String', desc:"单位职务"}
                     },
@@ -1058,7 +1058,7 @@ export const Config = {
                 {key:"form", type:"Object", sub:
                     {
                         name:{type:'String', desc:"姓名"},
-                        branchDuties:{type:'Number', desc:"分会职务"},
+                        branchDuties:{type:'[Number]', desc:"分会职务"},
                         unit:{type:'String', desc:"单位"},
                         unitDuties:{type:'String', desc:"单位职务"}
                     },