Commit 2156a650 by fudahua

Merge remote-tracking branch 'origin/developer' into developer

parents e20750e6 ecdba504
...@@ -327,7 +327,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -327,7 +327,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
log.info("【新增外部联系人】主门店为空"); log.info("【新增外部联系人】主门店为空");
return ""; return "";
} }
tab = getExternalClerkRelatedSelf(pojo, wxEnterpriseId, staffId, uuid, userId, selfExternalUserId,r.getStoreId()); tab = getExternalClerkRelatedSelf(pojo, wxEnterpriseId, staffId, uuid, userId, null,r.getStoreId());
}else{ }else{
tab = getExternalClerkRelated(pojo, wxEnterpriseId, staffId, uuid, userId, externalUserId); tab = getExternalClerkRelated(pojo, wxEnterpriseId, staffId, uuid, userId, externalUserId);
} }
...@@ -358,6 +358,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -358,6 +358,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
related.setUnionid(unionId); related.setUnionid(unionId);
related.setWxEnterpriseId(wxEnterpriseId); related.setWxEnterpriseId(wxEnterpriseId);
related.setWxUserId(userId); related.setWxUserId(userId);
related.setExternalUserId(externalUserid);
//externalClerkRelatedService.insert(related); //externalClerkRelatedService.insert(related);
return related; return related;
}else{ }else{
......
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