Commit 0378b37f by chenjinjing

no message

parent e1f67b22
...@@ -330,14 +330,15 @@ export async function getCertificateType({userId}) { ...@@ -330,14 +330,15 @@ export async function getCertificateType({userId}) {
//判断是否审批通过 //判断是否审批通过
if (userInfo.beforeChange) { if (userInfo.beforeChange) {
if (userInfo.changeApplyType == CHANGEAPPLYTYPE.通过) { if (userInfo.changeApplyType == CHANGEAPPLYTYPE.通过) {
if(userInfo.memberLevel == MEMBERLEVEL.理事会员 || userInfo.certificateType == MEMBERLEVEL.常务理事会员) certificate = true if(userInfo.memberLevel == MEMBERLEVEL.理事会员 || userInfo.memberLevel == MEMBERLEVEL.常务理事会员) certificate = true
if (certificate) { if (certificate) {
cefaInfo = { cefaInfo = {
memberLevel:changeEnumValue(MEMBERLEVEL, userInfo.memberLevel), memberLevel:changeEnumValue(MEMBERLEVEL, userInfo.memberLevel),
name:userInfo.name, name:userInfo.name,
unitName:userInfo.unitName, unitName:userInfo.unitName,
applyApplicationTime:moment(userInfo.applyApplicationTime).format("YYYY年MM月DD日") applyApplicationTime: ""
} }
if (userInfo.applyApplicationTime) cefaInfo.applyApplicationTime = moment(userInfo.applyApplicationTime).format("YYYY年MM月DD日")
msg = ``; msg = ``;
} }
} else if (userInfo.changeApplyType == CHANGEAPPLYTYPE.注册信息待补充) { } else if (userInfo.changeApplyType == CHANGEAPPLYTYPE.注册信息待补充) {
...@@ -346,7 +347,7 @@ export async function getCertificateType({userId}) { ...@@ -346,7 +347,7 @@ export async function getCertificateType({userId}) {
msg = `会员理事审核中,无法下载证明函`; msg = `会员理事审核中,无法下载证明函`;
} }
} else { } else {
if(userInfo.memberLevel == MEMBERLEVEL.理事会员 || userInfo.certificateType == MEMBERLEVEL.常务理事会员) certificate = true if(userInfo.memberLevel == MEMBERLEVEL.理事会员 || userInfo.memberLevel == MEMBERLEVEL.常务理事会员) certificate = true
if (certificate) { if (certificate) {
let name = ""; let name = "";
if (userInfo.memberType == MEMBERTYPE.个人会员) name = userInfo.name; if (userInfo.memberType == MEMBERTYPE.个人会员) name = userInfo.name;
...@@ -354,8 +355,9 @@ export async function getCertificateType({userId}) { ...@@ -354,8 +355,9 @@ export async function getCertificateType({userId}) {
cefaInfo = { cefaInfo = {
memberLevel:changeEnumValue(MEMBERLEVEL, userInfo.memberLevel), memberLevel:changeEnumValue(MEMBERLEVEL, userInfo.memberLevel),
name, name,
applyApplicationTime:moment(userInfo.applyApplicationTime).format("YYYY年MM月DD日") applyApplicationTime: ""
} }
if (userInfo.applyApplicationTime) cefaInfo.applyApplicationTime = moment(userInfo.applyApplicationTime).format("YYYY年MM月DD日")
msg = ``; msg = ``;
} }
} }
......
...@@ -245,7 +245,8 @@ export async function individualMemberList({name, documentId, phone, mail, joinS ...@@ -245,7 +245,8 @@ export async function individualMemberList({name, documentId, phone, mail, joinS
userRegisterState : USERREGISTERSTATE.通过, userRegisterState : USERREGISTERSTATE.通过,
isBlackUser:STATE. isBlackUser:STATE.
}; };
if (name) selectParam.name = name; if (name) selectParam.name = {"$regex":name};
if (documentId) selectParam.documentId = documentId; if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone; if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail; if (mail) selectParam.mail = mail;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment