Merge remote-tracking branch 'origin/manage-public' into manage-public

e63acc59 · 赵杰 · fba17062 · 7c866808 · e63acc59
Commit e63acc59 authored Feb 05, 2021 by 赵杰
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

report_service.py app/service/report_service.py +3 -2

No files found.
--- a/app/service/report_service.py
+++ b/app/service/report_service.py
@@ -329,9 +329,10 @@ def make_app_report(args):
            FundReportManange.type == 1,
            FundReportManange.default == 1
        )).first()
-        if template.default_template:
+        default_template = ""
+        if template and template.default_template:
            default_template = json.loads(template.default_template)
-        else:
+        elif template:
            default_template = json.loads(template.custom_template)
    # save_pdf.delay(record_id, ifa_id, customer_id, pdf_name, type)
    try: