fix

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

@@ -24,6 +24,8 @@ import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.MD5Utils;
 import com.gic.commons.util.Md5Util;
 import com.gic.commons.util.StringUtil;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.contacts.manage.api.dto.SearchDataDTO;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.MemberStoreDTO;
@@ -37,10 +39,12 @@ import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
 import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
+import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
 import com.gic.haoban.manage.service.service.MemberUnionRelatedService;
 import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
 import com.gic.haoban.manage.service.service.StaffService;
@@ -97,6 +101,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	private StaffDepartmentRelatedService staffDepartmentRelatedService;
 	@Autowired
 	private ESDataDynamicOperationApiService eSDataDynamicOperationApiService;
+	@Autowired
+	private ClerkMainStoreRelatedService clerkMainStoreRelatedService;
+	@Autowired
+	private StoreService storeService;
 	
 	@Autowired
 	private Config config;
@@ -249,15 +257,27 @@ 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;
 			}
@@ -271,7 +291,13 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 					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);
+							if(mainStore != null){
+								if(depart.getRelatedId().equals(mainStore.getStoreId())){
+									rList.add(staffDepartmentRelatedDTO);
+								}
+							}else{
+								rList.add(staffDepartmentRelatedDTO);
+							}
 						}
 					}
 				}
@@ -432,6 +458,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			}
 		}
 		
+		log.info("新增外部联系人】corpid={},suiteId={},userId1={}",wxEnterprise.getCorpid(),config.getSuiteId(),userId1);
 		String wxRes = qywxUserApiService.listExternalUserid(wxEnterprise.getCorpid(), config.getSuiteId(), userId1);
 		MemberUnionidRelatedDTO dto = new MemberUnionidRelatedDTO();
 		String externalUserId = "";
@@ -519,6 +546,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			
 			dto.setExternalName(name);
 			dto.setAddCreateTime(createTime);
+			dto.setWxUserId(userId1);
+			
 			if(StringUtils.isBlank(unionId)){
 				return "";
 			}