fix

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

@@ -53,14 +53,14 @@ public class FriendClerkSyncOperation implements BaseSyncOperation {
 			memberUnionidRelatedApiService.cleanNoExsitFriend(wxEnterpriseId, wxUserId,JSON.toJSONString(userIdList));
 			logger.info("userIdList={}",userIdList.size());
 			if(CollectionUtils.isNotEmpty(selfUserIdList)){
-				List<TabHaobanPreDealLog> dealLogList = selfUserIdList.stream().map(dto -> {
+				List<TabHaobanPreDealLog> dealLogList = selfUserIdList.stream().map(externalUserId -> {
 		            TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
-		            dealLog.setDataId(dto+wxUserId);
+		            dealLog.setDataId(externalUserId +"-"+ wxUserId);
 		            dealLog.setpDataId(dataPre.getDataId());
 		            dealLog.setDataType(PreDealTypeEnum.self_friend.getVal());
 		            dealLog.setStatusFlag(0);
 		            dealLog.setTaskId(dataPre.getTaskId());
-		            dealLog.setDataContent(dto);
+		            dealLog.setDataContent(externalUserId);
 		            dealLog.setWxEnterpriseId(wxEnterpriseId);
 		            return dealLog;
 		        }).collect(Collectors.toList());
@@ -71,14 +71,14 @@ public class FriendClerkSyncOperation implements BaseSyncOperation {
 			}
 			
 			if(CollectionUtils.isNotEmpty(userIdList)){
-				List<TabHaobanPreDealLog> dealLogList = userIdList.stream().map(dto -> {
+				List<TabHaobanPreDealLog> dealLogList = userIdList.stream().map(externalUserId -> {
 		            TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
-		            dealLog.setDataId(dto+wxUserId);
+		            dealLog.setDataId(externalUserId +"-"+ wxUserId);
 		            dealLog.setpDataId(dataPre.getDataId());
 		            dealLog.setDataType(PreDealTypeEnum.friend.getVal());
 		            dealLog.setStatusFlag(0);
 		            dealLog.setTaskId(dataPre.getTaskId());
-		            dealLog.setDataContent(dto);
+		            dealLog.setDataContent(externalUserId);
 		            dealLog.setWxEnterpriseId(wxEnterpriseId);
 		            return dealLog;
 		        }).collect(Collectors.toList());

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

@@ -110,7 +110,7 @@ public class FriendSyncOperation implements BaseSyncOperation {
 						
 						String addCreateTime = json.getAddCreateTime();
 						String name = json.getName();
-						String key = wxUserId + addCreateTime + name;
+						String key = name +"-"+wxUserId +"-"+ addCreateTime;
 						String unionId = json.getUnionId();
 						String wxEnterpriseId = tabHaobanPreDealLog.getWxEnterpriseId();
 						String externalUserId = json.getExternalUserId();

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

@@ -120,7 +120,7 @@ public class SelfFriendSyncOperation implements BaseSyncOperation{
 						ExternalUserDTO json = JSON.parseObject(dataContent, ExternalUserDTO.class);
 						String addCreateTime = json.getAddCreateTime();
 						String name = json.getName();
-						String key = wxUserId + addCreateTime + name;
+						String key = name +"-" +wxUserId +"-"+ addCreateTime;
 						String unionId = json.getUnionId();
 						String wxEnterpriseId = tabHaobanPreDealLog.getWxEnterpriseId();