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

src/biz/member/member.ts

@@ -2,7 +2,7 @@
  * 会员管理逻辑
  */
 
-import { MEMBERSTATE, MEMBERLEVEL, DOCUMENTTYPE, NATION, PROFCATEGORY, CODETYPE, MEMBERTYPE, REGISTERFLOW, SEX, USERREGISTERSTATE, OPERATIONREHAVIOR, STATE, BANXUELEIXING, UNITMEMBERTYPE, ADMINLV } from "../../config/enum";
+import { MEMBERSTATE, MEMBERLEVEL, DOCUMENTTYPE, NATION, PROFCATEGORY, MEMBERTYPE, USERREGISTERSTATE, STATE, UNITMEMBERTYPE, ADMINLV } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { TABLEENUM } from "../../data/models/model";
 import { find, findCount, findOnce, findOnceToSort, findToPage, findToSort } from "../../data/select";
@@ -215,6 +215,7 @@ export async function individualMemberList({name, documentId, phone, individualM
  * 其他附件: "cardUrl"：身份证正反面图片地址, "academicCERTUrl"：学历证明图片地址, "professionalCERTUrl"：工作证明图片地址, "auxiliaryMaterial"：其他辅助材料
  */
 
+const TopConfig = ["session", "memberLevel"];
 const IndividualBasicConfig = ["userId", "name", "sex", "nation", "birth", "documentType", "documentId", "sheng", "shi", "qu", "phone", "mail", "addres", "photoUrl", "education", "uscc", "unitName"];
 const SpecialityConfig = ["unitName", "duties", "workTitle", "profCategory", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF"];
 
@@ -222,7 +223,7 @@ export async function individualMemberDetails({id}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
     if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
 
-    let topInfo:any = extractData(oldInfo, ["session", "memberLevel"]);
+    let topInfo:any = extractData(oldInfo, TopConfig);
     topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
 
     let basicInfo:any = extractData(oldInfo, IndividualBasicConfig);

src/biz/register.ts

@@ -313,6 +313,7 @@ export async function unitMemberEcho2({userId}) {
 export async function unitMemberEcho3({userId}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId}, ["applicationForm"]);
     if (!oldInfo || !oldInfo.applicationForm) throw new BizError(ERRORENUM.目标数据不存在);
+    oldInfo.defaultApplicationForm = "http://192.168.0.105:40012/单位会员情况统计表.docx";
 
     return {dataInfo:oldInfo};
 }

src/routers/member/router.ts

@@ -239,7 +239,7 @@ export const Config = {
         },
         {
             apiName:"单位会员详情",
-            subUrl:'/memberdb/unitmemberdetails',
+            subUrl:'/memberdb/unit/memberdetails',
             param:[
                 {key:"id", type:"String", desc:"用户id"}
             ],
@@ -247,7 +247,7 @@ export const Config = {
         },
         {
             apiName:"个人会员详情",
-            subUrl:'/memberdb/individualmemberdetails',
+            subUrl:'/memberdb/individual/memberdetails',
             param:[
                 {key:"id", type:"String", desc:"用户id"}
             ],