|
@@ -103,12 +103,15 @@ public class Renderings extends Controller {
|
|
|
attRows.sortby("sequence", "linksid");
|
|
|
detailRow.put("attinfos", attRows);
|
|
|
detailRow.putIfAbsent("checkdate", "");
|
|
|
- detailRow.put("appleturl", userInfo.getWechatAppPage("marketingtool","CaseImgsUrl") + sat_sharematerialid);
|
|
|
+ detailRow.put("appleturl", userInfo.getWechatAppPage("marketingtool", "CaseImgsUrl") + sat_sharematerialid);
|
|
|
if (StringUtils.isBlank(detailRow.getString("panoramaurl"))) {
|
|
|
detailRow.put("ispanorama", 0);
|
|
|
} else {
|
|
|
detailRow.put("ispanorama", 1);
|
|
|
}
|
|
|
+ if (detailRow.getString("title").equals("")) {
|
|
|
+ detailRow.put("title", detailRow.getString("title_c"));
|
|
|
+ }
|
|
|
|
|
|
QuerySQL attachmentQuery = SQLFactory.createQuerySQL(this, "sys_attachment_links").setTableAlias("t1");
|
|
|
attachmentQuery.setSiteid(detailRow.getString("siteid"));
|
|
@@ -252,7 +255,7 @@ public class Renderings extends Controller {
|
|
|
} else {
|
|
|
row.put("ispanorama", 1);
|
|
|
}
|
|
|
- row.put("appleturl", userInfo.getWechatAppPage("marketingtool","CaseImgsUrl") + row.getString("sat_sharematerialid"));
|
|
|
+ row.put("appleturl", userInfo.getWechatAppPage("marketingtool", "CaseImgsUrl") + row.getString("sat_sharematerialid"));
|
|
|
}
|
|
|
|
|
|
|
|
@@ -424,17 +427,17 @@ public class Renderings extends Controller {
|
|
|
|
|
|
for (Row row : rows) {
|
|
|
if (type == 1) {
|
|
|
- row.put("appleturl", userInfo.getWechatAppPage("marketingtool","CaseImgsUrl") + row.getString("sat_sharematerialid"));
|
|
|
+ row.put("appleturl", userInfo.getWechatAppPage("marketingtool", "CaseImgsUrl") + row.getString("sat_sharematerialid"));
|
|
|
Rows Rows = rowsMap.getOrDefault(row.getString("sat_sharematerialid"), new Rows());
|
|
|
row.put("attinfos", Rows);
|
|
|
}
|
|
|
if (type == 2) {
|
|
|
- row.put("appleturl", userInfo.getWechatAppPage("marketingtool","DesignImgsUrl") + row.getString("sat_sharematerialid"));
|
|
|
+ row.put("appleturl", userInfo.getWechatAppPage("marketingtool", "DesignImgsUrl") + row.getString("sat_sharematerialid"));
|
|
|
Rows Rows = rowsMap.getOrDefault(row.getString("sat_sharematerialid"), new Rows());
|
|
|
row.put("attinfos", Rows);
|
|
|
}
|
|
|
if (type == 3) {
|
|
|
- row.put("appleturl", userInfo.getWechatAppPage("marketingtool","FadUrl") + row.getString("sa_fadid"));
|
|
|
+ row.put("appleturl", userInfo.getWechatAppPage("marketingtool", "FadUrl") + row.getString("sa_fadid"));
|
|
|
Rows Rows = rowsMap.getOrDefault(row.getString("sa_fadid"), new Rows());
|
|
|
row.put("attinfos", Rows);
|
|
|
}
|