离职继承重复离职多次

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

@@ -6,7 +6,6 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.*;
-import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.api.service.HandoverOperationApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.service.config.Config;
@@ -14,7 +13,9 @@ import com.gic.haoban.manage.service.entity.TabHandoverExternal;
 import com.gic.haoban.manage.service.entity.TabHandoverStaff;
 import com.gic.haoban.manage.service.entity.TabHandoverTransfer;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
-import com.gic.haoban.manage.service.service.*;
+import com.gic.haoban.manage.service.service.HandoverService;
+import com.gic.haoban.manage.service.service.StaffService;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.wechat.api.dto.qywx.QywxTransferCustomerInfoDTO;
 import com.gic.wechat.api.dto.qywx.QywxUnassignedInfoDTO;
 import com.gic.wechat.api.dto.qywx.response.QywxGetUnassignedListDTO;
@@ -28,10 +29,7 @@ import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static org.slf4j.LoggerFactory.getLogger;
@@ -115,7 +113,16 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
                 ret.addAll(unassignedListDTO.getInfo());
             }
         } while (StringUtils.isNotBlank(cursor) && unassignedListDTO.getErrcode() == 0);
-        return ret;
+        if (CollectionUtils.isEmpty(ret)) {
+            return ret;
+        }
+        //去重
+        return ret.stream().collect(
+                Collectors.collectingAndThen(
+                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(dto -> {
+                            return dto.getExternalUserid() + dto.getHandoverUserid();
+                        }))), ArrayList::new));
+
     }