Commit ebadef80 by lixinming

no message

parent f0ae20b8
...@@ -163,14 +163,11 @@ export async function submitDocument({name, memberType, documentId, phone, mail, ...@@ -163,14 +163,11 @@ export async function submitDocument({name, memberType, documentId, phone, mail,
if (!selectParam["$or"]) selectParam["$or"] = []; if (!selectParam["$or"]) selectParam["$or"] = [];
selectParam["$or"].push( selectParam["$or"].push(
{"$or":[ {"$or":[
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 }, { memberType:MEMBERTYPE.个人会员, registerFlow:REGISTERFLOW.完成第一步 }
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 }
]}, ]},
{"$or":[ {"$or":[
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 }, { memberType:MEMBERTYPE.单位会员, registerFlow:REGISTERFLOW.完成第一步 },
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 }, { memberType:MEMBERTYPE.单位会员, registerFlow:REGISTERFLOW.完成第二步 },
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 },
]} ]}
); );
} else { } else {
...@@ -178,17 +175,14 @@ export async function submitDocument({name, memberType, documentId, phone, mail, ...@@ -178,17 +175,14 @@ export async function submitDocument({name, memberType, documentId, phone, mail,
if (memberType.indexOf(MEMBERTYPE.个人会员) > -1) { if (memberType.indexOf(MEMBERTYPE.个人会员) > -1) {
// selectParam.memberType = MEMBERTYPE.个人会员; // selectParam.memberType = MEMBERTYPE.个人会员;
selectParam["$or"].push( selectParam["$or"].push(
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 }, { memberType:MEMBERTYPE.个人会员, registerFlow:REGISTERFLOW.完成第一步 }
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 }
); );
} }
if (memberType.indexOf(UNITMEMBERTYPE.其他) > -1 || memberType.indexOf(UNITMEMBERTYPE.机构) > -1 || memberType.indexOf(UNITMEMBERTYPE.院校) > -1) {//单位 if (memberType.indexOf(UNITMEMBERTYPE.其他) > -1 || memberType.indexOf(UNITMEMBERTYPE.机构) > -1 || memberType.indexOf(UNITMEMBERTYPE.院校) > -1) {//单位
// selectParam.unitMemberType = {"$in":memberType}; // selectParam.unitMemberType = {"$in":memberType};
selectParam["$or"].push( selectParam["$or"].push(
{ unitMemberType:{"$in":memberType}, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 }, { memberType:MEMBERTYPE.单位会员, registerFlow:REGISTERFLOW.完成第一步 },
{ unitMemberType:{"$in":memberType}, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 }, { memberType:MEMBERTYPE.单位会员, registerFlow:REGISTERFLOW.完成第二步 },
{ unitMemberType:{"$in":memberType}, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 },
); );
} }
} }
......
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