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

@@ -458,8 +458,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			}
 		}
 		
-		log.info("新增外部联系人】corpid={},suiteId={},userId1={}",wxEnterprise.getCorpid(),config.getSuiteId(),userId1);
-		String wxRes = qywxUserApiService.listExternalUserid(wxEnterprise.getCorpid(), config.getSuiteId(), userId1);
+		log.info("新增外部联系人】corpid={},suiteId={},userId1={}",wxEnterprise.getCorpid(),config.getWxSuiteid(),userId1);
+		String wxRes = qywxUserApiService.listExternalUserid(wxEnterprise.getCorpid(), config.getWxSuiteid(), userId1);
 		MemberUnionidRelatedDTO dto = new MemberUnionidRelatedDTO();
 		String externalUserId = "";
 		log.info("【新增外部联系人】wxRes={}",wxRes);
@@ -467,7 +467,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			JSONArray jsonArr = JSON.parseArray(wxRes);
 			String wxName = "";
 			for (Object externalUserid : jsonArr) {
-				String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), config.getSuiteId(), externalUserid.toString());
+				String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), config.getWxSuiteid(), externalUserid.toString());
 				
 				if(StringUtils.isNotBlank(uJ)){
 					JSONObject jo = JSON.parseObject(unionIdJson);
@@ -496,15 +496,28 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			}
 		}
 		
-		
+		TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId1, wxEnterprise.getWxEnterpriseId());
+		if(staff == null){
+			return "";
+		}
+		TabHaobanClerkMainStoreRelated r = clerkMainStoreRelatedService.selectByWxEnterpriseIdAndStoreId(staff.getStaffId(),wxEnterprise.getWxEnterpriseId());
+		StoreDTO mainStore = null;
 		
 		for (TabHaobanWxEnterpriseRelated tabHaobanWxEnterpriseRelated : list) {
+			if(r != null){
+				mainStore = storeService.getStore(r.getStoreId());
+				if(mainStore != null){
+					if(!tabHaobanWxEnterpriseRelated.getEnterpriseId().equals(mainStore.getEnterpriseId())){
+						continue;
+					}
+				}
+			}
 			String key = "external" + tabHaobanWxEnterpriseRelated.getEnterpriseId() + "_"+ userId1 + "_" + name + "_" + createTime;
 			RedisUtil.lock(key,2l);
 			dto.setWxEnterpriseId(tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
 			dto.setEnterpriseId(tabHaobanWxEnterpriseRelated.getEnterpriseId());
 			MemberDTO member = null;
-			TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId1, tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
+			//TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId1, tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
 			if(staff == null){
 				continue;
 			}
@@ -516,7 +529,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				log.info("【部门list】depart={},deparmentId={}",JSON.toJSONString(depart),staffDepartmentRelatedDTO.getDepartmentId());
 				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())){
+					if(mainStore != null){
+						if(depart.getRelatedId().equals(mainStore.getStoreId())){
+							rList.add(staffDepartmentRelatedDTO);
+						}
+					}else{
 						rList.add(staffDepartmentRelatedDTO);
 					}
 				}