fix：合并代码冲突

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

@@ -9,6 +9,7 @@ import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.common.utils.StringUtil;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
 import com.gic.haoban.manage.api.enums.BindTypeEnum;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;

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

@@ -741,7 +741,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
             WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
             //企微已经开启联系我
             List<String> wxUserIdsList = qywxUserApiService.listCorpExternalUser(qwDTO.getThirdCorpid(), config.getWxSuiteid());
-            List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService.listIdsByWxOpenUserIds(wxUserIdsList, wxEnterpriseId, enterpriseId);
+            List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService.listIdsByWxUserIds(wxUserIdsList, wxEnterpriseId, enterpriseId);
             if (CollectionUtils.isEmpty(staffClerkRelationDTOS)) {
                 logger.error("无导购关联数据");
                 continue;
@@ -761,7 +761,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
                 add(hmQrcodeQDTO);
             }
 
-            List<StaffClerkRelationDTO> relationDTOS = staffClerkRelationService.listIdsByNotInWxOpenUserIds(wxUserIdsList, wxEnterpriseId, enterpriseId);
+            List<StaffClerkRelationDTO> relationDTOS = staffClerkRelationService.listIdsByNotInWxUserIds(wxUserIdsList, wxEnterpriseId, enterpriseId);
             if (CollectionUtils.isEmpty(relationDTOS)) {
                 logger.error("无导购不包含关联数据");
                 continue;
@@ -787,7 +787,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         //查询出所有正常的导购
         //企微已经开启联系我
         List<String> wxUserIdsList = qywxUserApiService.listCorpExternalUser(qwDTO.getThirdCorpid(), config.getWxSuiteid());
-        List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService.listIdsByWxOpenUserIds(wxUserIdsList, wxEnterpriseId, enterpriseId);
+        List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService.listIdsByWxUserIds(wxUserIdsList, wxEnterpriseId, enterpriseId);
         if (CollectionUtils.isEmpty(staffClerkRelationDTOS)) {
             logger.error("无导购关联数据");
             return;
@@ -807,7 +807,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
             add(hmQrcodeQDTO);
         }
 
-        List<StaffClerkRelationDTO> relationDTOS = staffClerkRelationService.listIdsByNotInWxOpenUserIds(wxUserIdsList, wxEnterpriseId, enterpriseId);
+        List<StaffClerkRelationDTO> relationDTOS = staffClerkRelationService.listIdsByNotInWxUserIds(wxUserIdsList, wxEnterpriseId, enterpriseId);
         if (CollectionUtils.isEmpty(relationDTOS)) {
             logger.error("无导购不包含关联数据");
             return;