|
@@ -96,12 +96,12 @@ public class MailTemplateServiceImpl extends ServiceImpl<IMailTemplateMapper, Ma
|
|
}
|
|
}
|
|
StringBuilder webSites = new StringBuilder();
|
|
StringBuilder webSites = new StringBuilder();
|
|
for (ScenePro scenePro : proList) {
|
|
for (ScenePro scenePro : proList) {
|
|
- webSites.append(scenePro.getWebSite()).append("<p> </p>");
|
|
|
|
|
|
+ webSites.append(scenePro.getWebSite()).append("<br>");
|
|
}
|
|
}
|
|
for (ScenePlus scenePlus : plusList) {
|
|
for (ScenePlus scenePlus : plusList) {
|
|
ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
|
|
ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
|
|
if(scenePlusExt != null){
|
|
if(scenePlusExt != null){
|
|
- webSites.append(scenePlusExt.getWebSite()).append("<p> </p>");
|
|
|
|
|
|
+ webSites.append(scenePlusExt.getWebSite()).append("<br>");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if(StringUtils.isBlank(webSites)){
|
|
if(StringUtils.isBlank(webSites)){
|
|
@@ -131,7 +131,7 @@ public class MailTemplateServiceImpl extends ServiceImpl<IMailTemplateMapper, Ma
|
|
StringBuilder snCodes = new StringBuilder();
|
|
StringBuilder snCodes = new StringBuilder();
|
|
for (Long cameraId : cameraMap.keySet()) {
|
|
for (Long cameraId : cameraMap.keySet()) {
|
|
if(cameraMap.get(cameraId) != null){
|
|
if(cameraMap.get(cameraId) != null){
|
|
- snCodes.append(cameraMap.get(cameraId).getSnCode()).append("<p> </p>");
|
|
|
|
|
|
+ snCodes.append(cameraMap.get(cameraId).getSnCode()).append("<br>");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if(StringUtils.isBlank(snCodes)){
|
|
if(StringUtils.isBlank(snCodes)){
|