From 18870180c82d60afd5d9fe31191ecc339cb55142 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Wed, 20 May 2020 22:21:48 +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   | 4 ++--
 .../kiisoo/ic/job/count/CountDTOMessageGroupConsumer.java    | 2 +-
 src/main/resources/mapper/PrivilageCpUserDOMapper.xml        | 5 +----
 3 files changed, 4 insertions(+), 7 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 d521160..19fdd5e 100644
--- a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
+++ b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java
@@ -10,9 +10,9 @@ 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);
+    int insertCpUserCustomerRelation(@Param("customerUserId")String custeromUserId,@Param("cpUserId")String cpUserId);
 
-    CpUserCustomerRelationDO selectCpUserCustomerRelation(@Param("customerUserId")String custeromUserId, @Param("cpUserId")String cpUserId, @Param("cpId")Long cpId);
+    CpUserCustomerRelationDO selectCpUserCustomerRelation(@Param("customerUserId")String custeromUserId, @Param("cpUserId")String cpUserId);
 
     List<String> selectCpUserCustomerRelationByCpId(@Param("cpUserId")String cpUserId);
 
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 9b6bc29..346c7ae 100644
--- a/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageGroupConsumer.java
+++ b/src/main/java/com/kiisoo/ic/job/count/CountDTOMessageGroupConsumer.java
@@ -59,7 +59,7 @@ public class CountDTOMessageGroupConsumer implements WorkHandler<CountDTOMessage
         List<String> addedCustomerUserIds = privilageCpUserDOMapper.selectCpUserCustomerRelationByCpId(privilageCpUserDO.getCpUserId());
         for (String customerStr : customerStrs) {
             if (CollectionUtils.isEmpty(addedCustomerUserIds) || !addedCustomerUserIds.contains(customerStr)){
-                privilageCpUserDOMapper.insertCpUserCustomerRelation(customerStr,cpUserId,privilageCpUserDO.getId());
+                privilageCpUserDOMapper.insertCpUserCustomerRelation(customerStr,cpUserId);
             }
         }
     }
diff --git a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
index 0471265..4ffe1a8 100644
--- a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
+++ b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml
@@ -2,16 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper">
     <insert id="insertCpUserCustomerRelation">
-        insert into op_cp_user_customer_relation (customer_user_id,cp_user_id,cp_id)values (#{customerUserId},#{cpUserId},#{cpId})
+        insert into op_cp_user_customer_relation (customer_user_id,cp_user_id)values (#{customerUserId},#{cpUserId})
     </insert>
 
     <select id="selectCpUserCustomerRelation" resultType="com.kiisoo.ic.employee.entity.CpUserCustomerRelationDO">
         select customer_user_id as customerUserId,cp_user_id as cpUserId,cp_id as cpId from op_cp_user_customer_relation
         where customer_user_id = #{customerUserId}
         and cp_user_id = #{cpUserId}
-        <if test="cpId !=null and cpId !=''">
-            and cp_id = #{cpId}
-        </if>
         limit 1
     </select>
     <select id="selectCpUserCustomerRelationByCpId" resultType="java.lang.String">