From 35803ae2eb7349ba74da535f000734c0151fe736 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Fri, 15 May 2020 14:02:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ic/customer/service/CustomerViewService.java       | 10 +++++++++-
 .../ic/employee/mapper/PrivilageCpUserDOMapper.java    |  4 ++++
 .../kiisoo/ic/wx/service/QWMailListManageService.java  |  2 +-
 src/main/resources/mapper/PrivilageCpUserDOMapper.xml  |  4 ++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
index 1e0f077..010c4aa 100644
--- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
+++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java
@@ -20,6 +20,7 @@ import com.kiisoo.ic.store.entity.PoiStore;
 import com.kiisoo.ic.store.entity.PoiStoreStaff;
 import com.kiisoo.ic.store.entity.PrivilageCpUserStoreDO;
 import com.kiisoo.ic.store.mapper.PoiStoreDOMapper;
+import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper;
 import com.kiisoo.ic.synchronous.entity.TurnBackDTO;
 import com.kiisoo.ic.synchronous.entity.WxDataDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -78,6 +79,11 @@ public class CustomerViewService {
      */
     @Autowired
     private PrivilageCpUserDOMapper privilageCpUserDOMapper;
+    /**
+     * 用户权限mapper
+     */
+    @Autowired
+    private PrivilageCpUserStoreDOMapper privilageCpUserStoreDOMapper;
 
     /**
      * 店铺mapper
@@ -638,8 +644,10 @@ public class CustomerViewService {
         ExecutorService newFixedThreadPool = Executors.newFixedThreadPool(8);
 
         //查询现有企业微信账号
+        List<PrivilageCpUserStoreDO> relations = privilageCpUserStoreDOMapper.selectList(null);
+        List<Long> ids = relations.stream().map(relation -> relation.getCpUserId()).collect(Collectors.toList());
         QueryWrapper<PrivilageCpUserDO> qw = new QueryWrapper<>();
-        qw.ne("status",9);
+        qw.ne("status",9).in("id",ids);
         List<PrivilageCpUserDO> privilageCpUserDOS = privilageCpUserDOMapper.selectList(null);
         WxCpService wxCpService = WxCpConfiguration.getCpService(APPLICATIONID);
         WxCpExternalContactService externalContactService = wxCpService.getExternalContactService();
diff --git a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
index 6eec71d..ead4263 100644
--- a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
@@ -6,6 +6,8 @@ import com.kiisoo.ic.employee.entity.PrivilageCpUserDO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface PrivilageCpUserDOMapper extends BaseMapper<PrivilageCpUserDO> {
     int insertCpUserCustomerRelation(@Param("customerUserId")String custeromUserId,@Param("cpUserId")String cpUserId,@Param("cpId")Long cpId);
@@ -15,4 +17,6 @@ public interface PrivilageCpUserDOMapper extends BaseMapper<PrivilageCpUserDO> {
     Long selectAllCount();
 
     Long selectDistinctAllCount();
+
+    List<String> selectCustomerIdsByCpUserId(@Param("cpUserId")String cpUserId);
 }
diff --git a/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java b/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java
index fe4ccf3..63ec9a4 100644
--- a/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java
+++ b/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java
@@ -289,7 +289,7 @@ public class QWMailListManageService {
         List<WxCpUserExternalContactInfo> customers = null;
         wxCpService = WxCpConfiguration.getCpService(applicationid);
         WxCpExternalContactService externalContactService = wxCpService.getExternalContactService();
-        List<String> customerStrs = externalContactService.listExternalContacts(cpUserId);
+        List<String> customerStrs = privilageCpUserDOMapper.selectCustomerIdsByCpUserId(cpUserId);
         //查询客户列表为空则直接返回
         if (CollectionUtils.isNotEmpty(customerStrs)){
             customers = new ArrayList<>();
diff --git a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
index 8a86b59..38b1700 100644
--- a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
@@ -23,4 +23,8 @@
         select count(distinct customer_user_id) from op_cp_user_customer_relation
     </select>
 
+    <select id="selectCustomerIdsByCpUserId" resultType="java.lang.String">
+        select distinct customer_user_id from op_cp_user_customer_relation where cp_user_id = #{cpUserId}
+    </select>
+
 </mapper>