From d4881878905609454a9d19feb4523e3bb37b40b3 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 15 Sep 2020 10:29:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/TemplateDTO.java     | 6 +++++-
 .../java/com/epmet/service/impl/SubscribeServiceImpl.java   | 4 ++--
 .../src/main/resources/mapper/PersonalTemplateDao.xml       | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/TemplateDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/TemplateDTO.java
index b9c43fb0d3..0229316e01 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/TemplateDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/TemplateDTO.java
@@ -15,7 +15,11 @@ public class TemplateDTO implements Serializable {
 	/**
 	 * 模板ID
 	 */
-	private String priTmplId;
+	private String id;
+	/**
+	 * 模板ID
+	 */
+	private String tmplId;
 	/**
 	 * 标题
 	 */
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 b8ddb28343..1521aa508a 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
@@ -331,7 +331,7 @@ public class SubscribeServiceImpl implements SubscribeService {
 		List<String> resiPubTmplIds =
 				wxResiResult.getData().getData().stream().map(WxGetTemplateResult.DataBean::getPriTmplId).collect(Collectors.toList());
 		List<TemplateDTO> resiList = personalTemplateService.getListByCustomer(formDTO.getResiAppId(), formDTO.getCustomerId(), "resi");
-		List<String> resiTmplIds = resiList.stream().map(TemplateDTO::getPriTmplId).collect(Collectors.toList());
+		List<String> resiTmplIds = resiList.stream().map(TemplateDTO::getTmplId).collect(Collectors.toList());
 		List<String> resiReduce = resiPubTmplIds.stream().filter(item -> !resiTmplIds.contains(item)).collect(Collectors.toList());
 		resiReduce.forEach(tmplId -> {
 			WxDelTemplateReq request = new WxDelTemplateReq();
@@ -354,7 +354,7 @@ public class SubscribeServiceImpl implements SubscribeService {
 		List<String> workPubTmplIds =
 				wxWorkResult.getData().getData().stream().map(WxGetTemplateResult.DataBean::getPriTmplId).collect(Collectors.toList());
 		List<TemplateDTO> workList = personalTemplateService.getListByCustomer(formDTO.getWorkAppId(), formDTO.getCustomerId(), "work");
-		List<String> workTmplIds = workList.stream().map(TemplateDTO::getPriTmplId).collect(Collectors.toList());
+		List<String> workTmplIds = workList.stream().map(TemplateDTO::getTmplId).collect(Collectors.toList());
 		List<String> workReduce = workPubTmplIds.stream().filter(item -> !workTmplIds.contains(item)).collect(Collectors.toList());
 		workReduce.forEach(tmplId -> {
 			WxDelTemplateReq request = new WxDelTemplateReq();
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 4218ef19f4..f3b46b3c42 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
@@ -46,7 +46,8 @@
     </select>
     <select id="selectListByCustomerId" resultType="com.epmet.dto.result.TemplateDTO">
         SELECT
-            t1.ID AS priTmplId,
+            t1.ID AS id,
+            t1.PRI_TMPL_ID AS tmplId,
             t1.TITLE AS title,
             IF(ISNULL(t2.ID),'0','1') AS state
         FROM