Merge branch 'fix-7-15' into 'master'

Fix 7 15

See merge request !114

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

@@ -95,7 +95,7 @@ public class HandoverServiceImpl implements HandoverService {
         Map<String, List<QywxUnassignedInfoDTO>> handoverUserMap = infoList.stream().collect(Collectors.groupingBy(dto -> dto.getHandoverUserid()));
         handoverUserMap.forEach((userId, list) -> {
             boolean checkFlag = checkStaffOver(secretSetting, userId, wxEnterprise.getCorpid());
-            if (!checkFlag) {
+            if (checkFlag) {
                 logger.info("该用户存在，不需要离职基础：{},{}", userId, wxEnterpriseId);
                 return;
             }

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

@@ -18,7 +18,9 @@ import com.gic.commons.util.GICMQClientUtil;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreService;
+import com.gic.haoban.app.customer.dto.ChildDTO;
 import com.gic.haoban.app.customer.dto.CustomerDTO;
+import com.gic.haoban.app.customer.dto.FilterListDTO;
 import com.gic.haoban.app.customer.dto.MemberInfoListParamsDTO;
 import com.gic.haoban.app.customer.service.api.service.CustomerApiService;
 import com.gic.haoban.base.api.common.BasePageInfo;
@@ -255,6 +257,18 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
             MemberInfoListParamsDTO memberInfoListParamsDTO = new MemberInfoListParamsDTO();
             memberInfoListParamsDTO.setMemberId(tab.getMemberId());
+
+            FilterListDTO filterListDTO = new FilterListDTO();
+            filterListDTO.setFilterType("4");
+            ChildDTO childDTO = new ChildDTO();
+            childDTO.setId("");
+            filterListDTO.setChild(childDTO);
+            List<FilterListDTO> filterList = new ArrayList<>();
+            filterList.add(filterListDTO);
+
+            memberInfoListParamsDTO.setFilterList(filterList);
+
+
             boolean flag = customerApiService.checkMemberRangeByMemberId(params, memberInfoListParamsDTO);
             if (flag) {
                 MemberStoreDTO dto = new MemberStoreDTO();