Merge branch 'mlh_jzjx_project' into 'master'

玖姿空值转换

See merge request !30

roke_product_income_expense/controller/main.py

@@ -41,6 +41,12 @@ class ProductIncomeExpenseIframe(http.Controller):
             latest_record = model.search([], order="business_date desc,create_date desc", limit=1)
             latest_record = model.search([], order="business_date desc,create_date desc", limit=1)
             if latest_record:
             if latest_record:
                 data = data_list[0]
                 data = data_list[0]
+                expenditure = data.get("expenditure")
+                if expenditure in ['', None, False]:
+                    data.update({"expenditure": 0})
+                income = data.get("income")
+                if income in ['', None, False]:
+                    data.update({"income": 0})
                 balance = round(latest_record.balance + float(data.get("income")) - float(data.get("expenditure")), 2)
                 balance = round(latest_record.balance + float(data.get("income")) - float(data.get("expenditure")), 2)
             else:
             else:
                 # 如果没有找到任何记录
                 # 如果没有找到任何记录