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

@@ -139,7 +139,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			RedisUtil.lock(key,2l);
 			dto.setWxEnterpriseId(tabHaobanWxEnterpriseRelated.getEnterpriseId());
 			MemberDTO member = null;
-			TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId, tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
+			TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId1, tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
 			if(staff == null){
 				continue;
 			}
@@ -150,7 +150,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				for (StaffDepartmentRelatedDTO staffDepartmentRelatedDTO : relatedList) {
 					DepartmentDTO depart = departmentApiService.selectById(staffDepartmentRelatedDTO.getDepartmentId());
 					log.info("【部门list】depart={},deparmentId={}",JSON.toJSONString(depart),staffDepartmentRelatedDTO.getDepartmentId());
-					if(depart != null && tabHaobanWxEnterpriseRelated != null){
+					if(depart != null && tabHaobanWxEnterpriseRelated != null && depart.getEnterpriseId() != null && tabHaobanWxEnterpriseRelated.getEnterpriseId() != null){
 						log.info("【部门list】enterpriseId={},enterpriseId2={}",depart.getEnterpriseId(),tabHaobanWxEnterpriseRelated.getEnterpriseId());
 						if(depart.getEnterpriseId().equals(tabHaobanWxEnterpriseRelated.getEnterpriseId())){
 							rList.add(staffDepartmentRelatedDTO);