From 0d5d736bb77488f7e2552ffa1f50d485d301aa23 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Thu, 11 Jun 2020 14:52:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/TagCustomerDao.java           | 2 +-
 .../java/com/epmet/service/impl/TagCustomerServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/TagCustomerDao.xml              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java
index 4a837ca1a7..ea9faaef02 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/TagCustomerDao.java
@@ -40,7 +40,7 @@ public interface TagCustomerDao extends BaseDao<TagCustomerEntity> {
      * @param formDTO
      * @author zxc
      */
-    void checkTagInfo(UpdateTagFormDTO formDTO);
+    void upsertTagCount(UpdateTagFormDTO formDTO);
 
     /**
      * @Description  初始化默认标签
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java
index 95794c7367..90aa2280e1 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java
@@ -112,7 +112,7 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
         formDTO.setCustomerId(customerId);
         formDTO.setUpdatedBy(userId);
         formDTO.setTagName(tagName);
-        baseDao.checkTagInfo(formDTO);
+        baseDao.upsertTagCount(formDTO);
         UpdateTagUseCountsResultDTO resultDTO = new UpdateTagUseCountsResultDTO();
         resultDTO.setTagId(formDTO.getId());
         resultDTO.setTagName(tagName);
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml
index b7db9517c9..5d4d3e7bf2 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml
@@ -3,9 +3,9 @@
 
 <mapper namespace="com.epmet.dao.TagCustomerDao">
 
-    <insert id="checkTagInfo" parameterType="com.epmet.dto.form.UpdateTagFormDTO">
+    <insert id="upsertTagCount" parameterType="com.epmet.dto.form.UpdateTagFormDTO">
         <selectKey keyProperty="id" order="AFTER" resultType="String">
-            select id from tag_customer where tag_name = #{tagName}
+            select id from tag_customer where tag_name = #{tagName} AND CUSTOMER_ID = #{customerId}
         </selectKey>
         INSERT INTO tag_customer ( ID, CUSTOMER_ID, TAG_NAME, USE_COUNT, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES