From 5fb1dadd44f7bd571f9c57daca07a40840e0087b Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Fri, 23 Oct 2020 16:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E8=AE=A2=E9=98=85=EF=BC=8C?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96templateId=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dao/WxmpResiUserSubscribeDao.java   | 3 +--
 .../main/java/com/epmet/dao/WxmpWorkUserSubscribeDao.java   | 5 ++---
 .../java/com/epmet/service/impl/WxmpMessageServiceImpl.java | 6 +++---
 .../src/main/resources/mapper/WxmpResiUserSubscribeDao.xml  | 1 -
 .../src/main/resources/mapper/WxmpWorkUserSubscribeDao.xml  | 1 -
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpResiUserSubscribeDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpResiUserSubscribeDao.java
index 28080d66e7..2a525fa7c0 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpResiUserSubscribeDao.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpResiUserSubscribeDao.java
@@ -67,13 +67,12 @@ public interface WxmpResiUserSubscribeDao extends BaseDao<WxmpResiUserSubscribeE
     /**
      * @Description 获取模板id
      * @param openId
-     * @param templateId
      * @param customerId
      * @return java.lang.Integer
      * @Author liushaowen
      * @Date 2020/10/23 10:53
      */
-    String getResiSubscribeTemplateId(@Param("openId") String openId, @Param("templateId") String templateId, @Param("customerId") String customerId);
+    String getResiSubscribeTemplateId(@Param("openId") String openId, @Param("customerId") String customerId);
 
     WxmpResiUserSubscribeEntity getWxResiSubscribe(@Param("userId") String userId, @Param("customerId") String customerId,
                                                    @Param("templateId") String templateId);
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpWorkUserSubscribeDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpWorkUserSubscribeDao.java
index eb33773c8f..ff753085c1 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpWorkUserSubscribeDao.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/WxmpWorkUserSubscribeDao.java
@@ -23,7 +23,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
- * 工作端用户订阅模板消息有效次数记录表 
+ * 工作端用户订阅模板消息有效次数记录表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-10-21
@@ -68,13 +68,12 @@ public interface WxmpWorkUserSubscribeDao extends BaseDao<WxmpWorkUserSubscribeE
     /**
      * @Description 获取模板id
      * @param openId
-     * @param templateId
      * @param customerId
      * @return java.lang.String
      * @Author liushaowen
      * @Date 2020/10/23 10:54
      */
-    String getWorkSubscribeTemplateId(@Param("openId") String openId, @Param("templateId") String templateId, @Param("customerId") String customerId);
+    String getWorkSubscribeTemplateId(@Param("openId") String openId, @Param("customerId") String customerId);
 
     WxmpWorkUserSubscribeEntity getWxWorkSubscribe(@Param("userId") String userId,
                                                    @Param("customerId") String customerId,
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
index 90e455ce8a..832ef44a33 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
@@ -169,9 +169,9 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
 
                 //获取模板id
                 if (WxmpMessageConstant.RESI.equals(clientType)) {
-                    templateId = wxmpResiUserSubscribeDao.getResiSubscribeTemplateId(openId, templateId, customerId);
+                    templateId = wxmpResiUserSubscribeDao.getResiSubscribeTemplateId(openId, customerId);
                 } else if (WxmpMessageConstant.WORK.equals(clientType)) {
-                    templateId = wxmpWorkUserSubscribeDao.getWorkSubscribeTemplateId(openId, templateId, customerId);
+                    templateId = wxmpWorkUserSubscribeDao.getWorkSubscribeTemplateId(openId, customerId);
                 }
                 if (StringUtils.isBlank(templateId)) {
                     throw new WxSubscribeException("获取模板id失败", "", openId);
@@ -470,4 +470,4 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
 		}
 		return staffBasicInfo.getOpenId();
 	}
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpResiUserSubscribeDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpResiUserSubscribeDao.xml
index 099108d016..842e3a9e70 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpResiUserSubscribeDao.xml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpResiUserSubscribeDao.xml
@@ -44,7 +44,6 @@
       where
         del_flag = 0
         and customer_id = #{customerId}
-        and template_id = #{templateId}
         and wx_open_id = #{openId}
         and wx_subscribe_status = 'subscribe'
       limit 1
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpWorkUserSubscribeDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpWorkUserSubscribeDao.xml
index 7c9e547118..b1e092a166 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpWorkUserSubscribeDao.xml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/WxmpWorkUserSubscribeDao.xml
@@ -50,7 +50,6 @@
       where
         del_flag = 0
         and customer_id = #{customerId}
-        and template_id = #{templateId}
         and wx_open_id = #{openId}
         and wx_subscribe_status = 'subscribe'
       limit 1