离职继承bug修复

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

@@ -110,13 +110,12 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
             List<QywxUnassignedInfoDTO> infoList = unassignedListDTO.getInfo();
             if (CollectionUtils.isNotEmpty(infoList)) {
                 //这里过滤staff成员id，避免ret数组过大
-                ret.addAll(infoList);
                 //根据handoverUserid去重
                 List<QywxUnassignedInfoDTO> collect = infoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QywxUnassignedInfoDTO::getHandoverUserid))), ArrayList::new));
                 for (QywxUnassignedInfoDTO dto : collect){
                     String handoverUserid = dto.getHandoverUserid();
                     if (handoverService.filterHandoverStaff(wxEnterpriseId, handoverUserid)) {
-                        ret = ret.stream().filter(d -> !d.getHandoverUserid().equals(handoverUserid)).collect(Collectors.toList());
+                        ret.add(dto);
                     }
                 }
             }

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

@@ -877,7 +877,11 @@
     <select id="getMemberIdByExternalId"  resultType="java.lang.String">
         select member_id
         from tab_haoban_external_clerk_related  where wx_enterprise_id = #{wxEnterpriseId}
-        and (external_user_id = #{externalUserId} or self_external_userid = #{externalUserId}) and status_flag =1
+        and external_user_id = #{externalUserId} and status_flag =1
+        UNION all
+        select member_id
+        from tab_haoban_external_clerk_related  where wx_enterprise_id = #{wxEnterpriseId}
+        and self_external_userid = #{externalUserId} and status_flag =1
         limit 1
     </select>