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

@@ -132,6 +132,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			MemberDTO member = null;
 			for (TabHaobanWxEnterpriseRelated tabHaobanWxEnterpriseRelated : list) {
 				TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId, tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
+				if(staff == null){
+					continue;
+				}
 				List<StaffDepartmentRelatedDTO> relatedList = staffDepartmentRelatedApiService.listByStaffId(staff.getStaffId());
 				String clerkCode = "";
 				if(!relatedList.isEmpty()){
@@ -144,6 +147,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				}
 				ClerkDTO clerk = clerkService.getClerkByClerkCode(tabHaobanWxEnterpriseRelated.getEnterpriseId(), clerkCode);
 				if(clerk != null){
+					log.info("【新增外部联系人会员】enterpriseId={},unionId={},name={},avatar={},QrcodeParam={}",tabHaobanWxEnterpriseRelated.getEnterpriseId(),unionId,name,avatar,clerk.getQrcodeParam());
 					 member = memberOpenCardBusinessService.getMemberByQywxChannelParam(tabHaobanWxEnterpriseRelated.getEnterpriseId(),unionId,null,name,avatar,clerk.getQrcodeParam());
 				}
 				log.info("【新增外部联系人】member={}",JSON.toJSONString(member));