From d53abf7c4cdb82aa3ef6e86315d519b308599fc3 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Mon, 18 May 2020 03:36:42 +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

---
 .../kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java   | 2 ++
 .../kiisoo/ic/job/count/CountDTOMessageGroupConsumer.java    | 4 ++--
 src/main/resources/mapper/PrivilageCpUserDOMapper.xml        | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

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 ead4263..4c5168f 100644
--- a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
@@ -14,6 +14,8 @@ public interface PrivilageCpUserDOMapper extends BaseMapper<PrivilageCpUserDO> {
 
     CpUserCustomerRelationDO selectCpUserCustomerRelation(@Param("customerUserId")String custeromUserId, @Param("cpUserId")String cpUserId, @Param("cpId")Long cpId);
 
+    List<String> selectCpUserCustomerRelationByCpId(@Param("cpId")Long cpId);
+
     Long selectAllCount();
 
     Long selectDistinctAllCount();
diff --git a/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageGroupConsumer.java b/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageGroupConsumer.java
index 263b6de..fe9ff47 100644
--- a/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageGroupConsumer.java
+++ b/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageGroupConsumer.java
@@ -58,9 +58,9 @@ public class CountDTOMessageGroupConsumer implements WorkHandler<CountDTOMessage
             privilageCpUserDOMapper.insert(privilageCpUserDO);
         }
         //批量添加账号
+        List<String> addedCustomerUserIds = privilageCpUserDOMapper.selectCpUserCustomerRelationByCpId(privilageCpUserDO.getId());
         for (String customerStr : customerStrs) {
-            CpUserCustomerRelationDO cpUserCustomerRelationDO = privilageCpUserDOMapper.selectCpUserCustomerRelation(customerStr, cpUserId, privilageCpUserDO.getId());
-            if (cpUserCustomerRelationDO == null){
+            if (CollectionUtils.isEmpty(addedCustomerUserIds) || !addedCustomerUserIds.contains(customerStr)){
                 privilageCpUserDOMapper.insertCpUserCustomerRelation(customerStr,cpUserId,privilageCpUserDO.getId());
             }
         }
diff --git a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
index 38b1700..5fed538 100644
--- a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
@@ -14,6 +14,11 @@
         </if>
         limit 1
     </select>
+    <select id="selectCpUserCustomerRelationByCpId" resultType="java.lang.String">
+        select customer_user_id as customerUserId
+        from op_cp_user_customer_relation
+        where cp_id = #{cpId}
+    </select>
 
     <select id="selectAllCount" resultType="java.lang.Long">
         select count(id) from op_cp_user_customer_relation