fix：刷新好友

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendClerkSyncNewOperation.java

 package com.gic.haoban.manage.service.task.friend;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.GICMQClientUtil;
@@ -31,6 +19,18 @@ import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.task.BaseSyncOperation;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * 微信好友
@@ -105,31 +105,34 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
             //清理外部联系人
             memberUnionidRelatedApiService.cleanNoExsitFriendNew(wxEnterpriseId, wxUserId3th, userIdList);
             //写入外部联系人的处理队列
-            List<TabHaobanPreDealLog> dealLogList = selfUserIdList.stream().map(externalUserId -> {
+            List<TabHaobanPreDealLog> dealLogList = new ArrayList<>();
+            for (String externalUserId : selfUserIdList) {
                 TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
-                dealLog.setDataId(externalUserId + "-" + dataPre.getDataId());
-                dealLog.setpDataId(dataPre.getDataId());
+                dealLog.setDataId(externalUserId + "-" + dkWxUserId);
+                dealLog.setpDataId(dkWxUserId);
                 dealLog.setDataType(PreDealTypeEnum.self_friend.getVal());
                 dealLog.setStatusFlag(0);
                 dealLog.setTaskId(dataPre.getTaskId());
                 dealLog.setDataContent(externalUserId);
                 dealLog.setWxEnterpriseId(wxEnterpriseId);
-                return dealLog;
-            }).collect(Collectors.toList());
+                dealLogList.add(dealLog);
+            }
+
             preDealService.insert(dealLogList);
 
             //写入外部联系人的处理队列
-            List<TabHaobanPreDealLog> thirddealLogList = userIdList.stream().map(externalUserId -> {
+            List<TabHaobanPreDealLog> thirddealLogList = new ArrayList<>();
+            for (String externalUserId : userIdList) {
                 TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
-                dealLog.setDataId(externalUserId + "-" + dataPre.getDataId());
-                dealLog.setpDataId(dataPre.getDataId());
+                dealLog.setDataId(externalUserId + "-" + wxUserId3th);
+                dealLog.setpDataId(wxUserId3th);
                 dealLog.setDataType(PreDealTypeEnum.friend.getVal());
                 dealLog.setStatusFlag(0);
                 dealLog.setTaskId(dataPre.getTaskId());
                 dealLog.setDataContent(externalUserId);
                 dealLog.setWxEnterpriseId(wxEnterpriseId);
-                return dealLog;
-            }).collect(Collectors.toList());
+                thirddealLogList.add(dealLog);
+            }
             preDealService.insert(thirddealLogList);
             //成功更新状态
             dealSuccess(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), dataPre.getWxEnterpriseId());

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

@@ -206,7 +206,6 @@
     <update id="updateStatusByDataId">
         update tab_haoban_pre_deal_log
         <set>
-
             status_flag = #{status,jdbcType=INTEGER},
             reason=#{reason},
             update_time = now()
@@ -347,7 +346,6 @@
     <update id="updateFriendStatusByDataId">
         update tab_haoban_pre_deal_log
         <set>
-
             status_flag = #{status,jdbcType=INTEGER},
             reason=#{reason},
             data_content = #{dataContent},
@@ -359,7 +357,6 @@
     <update id="updateFriendStatusAndRelationKeyByDataId">
         update tab_haoban_pre_deal_log
         <set>
-
             status_flag = #{status,jdbcType=INTEGER},
             reason=#{reason},
             <if test="dataContent !=null">