fix

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

@@ -77,7 +77,9 @@ public class FriendMergeSyncOperation implements BaseSyncOperation{
         }
         logger.info("好友合并成功:{}", taskId);
         int errorCount = preDealService.countByTaskId(taskId, PreDealTypeEnum.friend_merge.getVal(), 3);
-        if(errorCount > 0){
+        int errorSelfCount = preDealService.countByTaskId(taskId, PreDealTypeEnum.self_friend.getVal(), 3);
+        int errorFriendCount = preDealService.countByTaskId(taskId, PreDealTypeEnum.friend.getVal(), 3);
+        if(errorCount > 0 || errorFriendCount > 0 || errorSelfCount > 0){
         	syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.exception_compute.getVal());
         }else{
         	syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());