Merge branch 'dev'

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SubscribeServiceImpl.java

@@ -284,6 +284,7 @@ public class SubscribeServiceImpl implements SubscribeService {
 				}
 				String tmplId = wxResult.getData();
 				PersonalTemplateDTO personalTemplate = ConvertUtils.sourceToTarget(templateDTO, PersonalTemplateDTO.class);
+				personalTemplate.setId(null);
 				personalTemplate.setPriTmplId(tmplId);
 				personalTemplate.setCustomerId(formDTO.getCustomerId());
 				personalTemplate.setClientType("resi");
@@ -312,9 +313,10 @@ public class SubscribeServiceImpl implements SubscribeService {
 				}
 				String tmplId = wxResult.getData();
 				PersonalTemplateDTO personalTemplate = ConvertUtils.sourceToTarget(templateDTO, PersonalTemplateDTO.class);
+				personalTemplate.setId(null);
 				personalTemplate.setPriTmplId(tmplId);
 				personalTemplate.setCustomerId(formDTO.getCustomerId());
-				personalTemplate.setClientType("resi");
+				personalTemplate.setClientType("work");
 				personalTemplate.setAppId(authInfo.getAuthorizerAppid());
 				personalTemplateService.save(personalTemplate);
 			});

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1230,9 +1230,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         if (!r.success()){
             throw new RenException("查询话题发起人失败......");
         }
-        IssueInitiatorResultDTO issueInitiatorResult = r.getData();
-        if (!StringUtils.isBlank(issueInitiatorResult.getIssueInitiator())) {
-            topicInfo.setPublishedUser(issueInitiatorResult.getIssueInitiator());
+        if (null != r.getData()){
+            IssueInitiatorResultDTO issueInitiatorResult = r.getData();
+            if (!StringUtils.isBlank(issueInitiatorResult.getIssueInitiator())) {
+                topicInfo.setPublishedUser(issueInitiatorResult.getIssueInitiator());
+            }
         }
         return topicInfo;
     }