Merge branch 'dev'

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());
 

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}