iiiiii

Signed-off-by: Binren Zhnag <zhangbr@elab-plus.com>

flask_app.py

@@ -251,6 +251,7 @@ def debug_func():
     try:
         data = rj.brand_data()
         house_ids = rj.get_house_id_by_brand_id('13')
+        result['houseids'] = house_ids
         result['data1'] = data
         table_2 = rj.house_data(house_ids)
         result['data2'] = table_2

jianye_report.py

@@ -112,7 +112,7 @@ class JianYeReport(object):
     def get_house_id_by_brand_id(self, brand_id):
         result = []
         for x in self.get_city_house_id():
-            if str(x[0]) == str(brand_id):
+            if str(x[0]) == str(brand_id) and x[1] is not None:
                 result.append(x[1])
         return result
 
@@ -208,10 +208,8 @@ class JianYeReport(object):
         time_range_1 = rpfu.get_prd_day()
         time_range_2 = rpfu.get_time_range_month()
         time_range_3 = rpfu.get_all_time_data_range()
-        result = []
-        result.append(self.house_data_of_time(time_range_1, house_ids))
-        result.append(self.house_data_of_time(time_range_2, house_ids))
-        result.append(self.house_data_of_time(time_range_3, house_ids))
+        result = [self.house_data_of_time(time_range_1, house_ids), self.house_data_of_time(time_range_2, house_ids),
+                  self.house_data_of_time(time_range_3, house_ids)]
         return result
 
     def send_mail_to_customer(self, task_key):