fix

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

@@ -55,7 +55,7 @@ public class FriendClerkSyncOperation implements BaseSyncOperation {
 			if(CollectionUtils.isNotEmpty(selfUserIdList)){
 				List<TabHaobanPreDealLog> dealLogList = selfUserIdList.stream().map(dto -> {
 		            TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
-		            dealLog.setDataId(dto);
+		            dealLog.setDataId(dto+wxUserId);
 		            dealLog.setpDataId(dataPre.getDataId());
 		            dealLog.setDataType(PreDealTypeEnum.self_friend.getVal());
 		            dealLog.setStatusFlag(0);
@@ -73,7 +73,7 @@ public class FriendClerkSyncOperation implements BaseSyncOperation {
 			if(CollectionUtils.isNotEmpty(userIdList)){
 				List<TabHaobanPreDealLog> dealLogList = userIdList.stream().map(dto -> {
 		            TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
-		            dealLog.setDataId(dto);
+		            dealLog.setDataId(dto+wxUserId);
 		            dealLog.setpDataId(dataPre.getDataId());
 		            dealLog.setDataType(PreDealTypeEnum.friend.getVal());
 		            dealLog.setStatusFlag(0);

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

@@ -113,13 +113,14 @@ public class FriendSyncOperation implements BaseSyncOperation {
 						String key = wxUserId + addCreateTime + name;
 						String unionId = json.getUnionId();
 						String wxEnterpriseId = tabHaobanPreDealLog.getWxEnterpriseId();
+						String externalUserId = json.getExternalUserId();
 						
 						ExternalUserDTO dto = map.get(key);
 						if(dto != null){
 							if(tabHaobanPreDealLog.getDataType() == PreDealTypeEnum.self_friend.getVal()){
 								dto.setUnionId(unionId);
 							}else if(tabHaobanPreDealLog.getDataType() == PreDealTypeEnum.friend.getVal()){
-								dto.setExternalUserId(tabHaobanPreDealLog.getDataId());
+								dto.setExternalUserId(externalUserId);
 							}
 							TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
 				            dealLog.setDataId(key);