Commit b3a823d3 authored by kevin's avatar kevin

#

parent 9f294850
...@@ -243,7 +243,6 @@ public class TemplateController extends BaseController { ...@@ -243,7 +243,6 @@ public class TemplateController extends BaseController {
} }
out = null; out = null;
} }
if (inputStream != null) { if (inputStream != null) {
try { try {
inputStream.close(); inputStream.close();
......
...@@ -273,6 +273,8 @@ ...@@ -273,6 +273,8 @@
break; break;
case enums.formulaDataSourceType.InvoiceFilter: case enums.formulaDataSourceType.InvoiceFilter:
break; break;
case enums.formulaDataSourceType.CIT_TBAM:
obj.relSql = sourceData.relSql;
} }
if (sourceData.type === 0 && sourceData.dataSourceType === enums.cellDataSourceType.RelatedModel) { if (sourceData.type === 0 && sourceData.dataSourceType === enums.cellDataSourceType.RelatedModel) {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'app/cit/report/cit-report-view/cit-report-view.html' + '?_=' + Math.random(), templateUrl: '/app/cit/report/cit-report-view/cit-report-view.html' + '?_=' + Math.random(),
scope: { scope: {
templateId: '=', templateId: '=',
reportId: '=', reportId: '=',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment