From 3d3168829f013b43121a023fd4ad7848674a1d6d Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 12 Jan 2021 14:31:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/PersonalTemplateDao.xml    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PersonalTemplateDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PersonalTemplateDao.xml
index 1b73c85569..644cda2bc6 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PersonalTemplateDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PersonalTemplateDao.xml
@@ -39,7 +39,17 @@
     </select>
     <select id="selectSetTemp" resultType="com.epmet.dto.PersonalTemplateDTO">
         SELECT ID,
-               TITLE
+            CUSTOMER_ID,
+            CLIENT_TYPE,
+            APP_ID,
+            PID,
+            PRI_TMPL_ID,
+            TYPE,
+            TID,
+            TITLE,
+            KEY_IDS,
+            KEY_WORDS,
+            SCENE_DESC
         FROM personal_template
         WHERE DEL_FLAG = '0'
           AND CUSTOMER_ID = #{customerId}

From 9d0639479561f967781586b28a4631e9c5c65439 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 12 Jan 2021 14:36:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=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/service/impl/SubscribeServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SubscribeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SubscribeServiceImpl.java
index 27a8497fb6..b51c32632e 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SubscribeServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SubscribeServiceImpl.java
@@ -399,7 +399,7 @@ public class SubscribeServiceImpl implements SubscribeService {
 		if (null != customerList && customerList.size() > NumConstant.ZERO) {
 			for (PaCustomerDTO paCustomerDTO : customerList) {
 				PersonalTemplateDTO personalTemplateDTO = personalTemplateService.getTempByPid(paCustomerDTO.getId(), publicDTO.getPriTmplId());
-				if (null != personalTemplateDTO) {
+				if (null == personalTemplateDTO) {
 					//获取小程序调用令牌
 					AuthorizationInfoDTO authDTO = authorizationInfoDao.getAuthInfoByCustomer(paCustomerDTO.getId(), authInfo.getClientType());