Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -62,13 +62,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			return "";
 		}
 		List<TabHaobanWxEnterpriseRelated> list = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterprise.getWxEnterpriseId());
-		MemberDTO member = null;
-		for (TabHaobanWxEnterpriseRelated tabHaobanWxEnterpriseRelated : list) {
-			 member = memberService.getMemberByUnionid(dto.getUnionid(), tabHaobanWxEnterpriseRelated.getEnterpriseId());
-			 if(member != null){
-				 break;
-			 }
-		}
 		
 		String unionIdJson = qywxUserApiService.getExternalUseridInfo(dto.getCorpid(), dto.getSuiteid(), dto.getExternalUserid());
 		log.info("【新增外部联系人回调】unionIdJson={}",JSON.toJSONString(unionIdJson));
@@ -77,6 +70,14 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			JSONObject jo = JSON.parseObject(unionIdJson);
 			unionId = jo.getString("unionid");
 		}
+		
+		MemberDTO member = null;
+		for (TabHaobanWxEnterpriseRelated tabHaobanWxEnterpriseRelated : list) {
+			 member = memberService.getMemberByUnionid(unionId, tabHaobanWxEnterpriseRelated.getEnterpriseId());
+			 if(member != null){
+				 break;
+			 }
+		}
 		if(member != null){
 			dto.setMemberId(member.getMemberId());
 		}