fix

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanClerkMainStoreRelatedMapper.java

 package com.gic.haoban.manage.service.dao.mapper;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
@@ -18,4 +20,6 @@ public interface TabHaobanClerkMainStoreRelatedMapper {
     int updateByPrimaryKey(TabHaobanClerkMainStoreRelated record);
 
 	TabHaobanClerkMainStoreRelated selectByWxEnterpriseIdAndStoreId(@Param("staffId")String staffId, @Param("wxEnterpriseId")String wxEnterpriseId);
+
+	List<TabHaobanClerkMainStoreRelated> listByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/ClerkMainStoreRelatedService.java

 package com.gic.haoban.manage.service.service;
 
+import java.util.List;
+
 import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
 
 public interface ClerkMainStoreRelatedService {
@@ -10,4 +12,6 @@ public interface ClerkMainStoreRelatedService {
 
 	void update(TabHaobanClerkMainStoreRelated r);
 
+	List<TabHaobanClerkMainStoreRelated> listByWxEnterpriseId(String wxEnterpriseId);
+
 }

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

 package com.gic.haoban.manage.service.service.impl;
 
 import java.util.Date;
+import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,4 +43,9 @@ public class ClerkMainStoreRelatedServiceImpl implements ClerkMainStoreRelatedSe
 		mapper.updateByPrimaryKeySelective(r);
 	}
 
+	@Override
+	public List<TabHaobanClerkMainStoreRelated> listByWxEnterpriseId(String wxEnterpriseId) {
+		return mapper.listByWxEnterpriseId(wxEnterpriseId);
+	}
+
 }

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

@@ -21,9 +21,11 @@ import com.gic.haoban.manage.api.enums.PreDealStatusEnum;
 import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.api.enums.SyncTaskStatusEnum;
+import com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService;
 import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
@@ -101,6 +103,9 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
 
     @Autowired
     private SecretSettingService secretSettingService;
+    
+    @Autowired
+    private ClerkMainStoreRelatedService clerkMainStoreRelatedService;
 
     private static final String LOCK_KEY = "sync_wx_lock_";
 
@@ -669,7 +674,9 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
 	@Override
 	public void dealWxFriendClerk(String taskId, String wxEnterpriseId) {
 		List<TabHaobanStaffClerkRelation> relationList = staffClerkRelationService.listByWxEnterpriseId(wxEnterpriseId);
-        List<TabHaobanPreDealLog> dealLogList = relationList.stream().map(dto -> {
+		List<TabHaobanClerkMainStoreRelated> mainStoreList = clerkMainStoreRelatedService.listByWxEnterpriseId(wxEnterpriseId);
+		Map<String,TabHaobanClerkMainStoreRelated> map = mainStoreList.stream().collect(Collectors.toMap(TabHaobanClerkMainStoreRelated::getStaffId, s -> s));
+        List<TabHaobanPreDealLog> dealLogList = relationList.stream().filter(ls->map.get(ls.getStaffId()) != null).map(dto -> {
             TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
             dealLog.setDataId(dto.getWxUserId().toString());
             dealLog.setpDataId(dto.getStaffId().toString());

haoban-manage3-service/src/main/resources/mapper/TabHaobanClerkMainStoreRelatedMapper.xml

@@ -138,4 +138,12 @@
     and status_flag = 1
     limit 1
   </select>
+  
+  <select id="listByWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_clerk_main_store_related
+    and wx_enterprise_id = #{wxEnterpriseId}
+    and status_flag = 1
+  </select>
 </mapper>
\ No newline at end of file