离职继承bug修复

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

@@ -120,5 +120,5 @@ public interface HandoverService {
      * @return
      */
     public List<HandoverStaffFriendCountDTO> listFriendCountByWxStaffIds(String wxEnterpriseId, List<String> staffIds);
-    TabHandoverStaff getHandoverStaff(String wxEnterpriseId, String wxUserId);
+    Boolean filterHandoverStaff(String wxEnterpriseId, String wxUserId);
 }

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

@@ -176,7 +176,6 @@ public class HandoverServiceImpl implements HandoverService {
             staffClerkRelationService.cleanStaffClerk(handoverStaff.getWxEnterpriseId(), staffIds);
         }
     }
-    @Override
     public TabHandoverStaff getHandoverStaff(String wxEnterpriseId, String wxUserId) {
         TabHaobanStaff haobanStaff = staffMapper.getNoStatusByWxUserIds(wxEnterpriseId, wxUserId);
         if (null == haobanStaff) {
@@ -340,4 +339,25 @@ public class HandoverServiceImpl implements HandoverService {
         List<HandoverStaffFriendCountDTO> ret = handoverExternalMapper.listPreCountByStaffIds(wxEnterpriseId, staffIds);
         return ret;
     }
+
+    @Override
+    public Boolean filterHandoverStaff(String wxEnterpriseId, String wxUserId) {
+        TabHaobanStaff haobanStaff = staffMapper.getNoStatusByWxUserIds(wxEnterpriseId, wxUserId);
+        if (null == haobanStaff) {
+            logger.info("对应的staff不存在：{}", wxUserId);
+            return false;
+        }
+        TabHandoverStaff handoverStaff = handoverStaffMapper.getByStaffId(wxEnterpriseId, haobanStaff.getStaffId());
+        if (null != handoverStaff) {
+            logger.info("对应的handoverStaff已存在：{}", haobanStaff.getStaffId());
+            return false;
+        }
+        TabHaobanClerkMainStoreRelated clerkMainStoreRelated = clerkMainStoreRelatedMapper.getLastNoStatusByStaffId(wxEnterpriseId, haobanStaff.getStaffId());
+        if (null == clerkMainStoreRelated) {
+            logger.info("没有主门店：{}", haobanStaff.getStaffId());
+            // 需要过滤 没有主门店的人 不需要执行
+            return false;
+        }
+        return true;
+    }
 }

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

@@ -112,14 +112,13 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
                 //这里过滤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));
+                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();
-                    TabHandoverStaff handoverStaff = handoverService.getHandoverStaff(wxEnterpriseId, handoverUserid);
-                    if (null == handoverStaff) {
+                    if (handoverService.filterHandoverStaff(wxEnterpriseId, handoverUserid)) {
                         ret = ret.stream().filter(d -> !d.getHandoverUserid().equals(handoverUserid)).collect(Collectors.toList());
                     }
-                }*/
+                }
             }
         } while (StringUtils.isNotBlank(cursor) && unassignedListDTO.getErrcode() == 0);
         if (CollectionUtils.isEmpty(ret)) {