Merge branch '0717-v3.3.5' of https://gitee.com/zwyjjc/tl_estate into 0717-v3.3.5

application/index/controller/Cost.php

@@ -283,7 +283,7 @@ class Cost extends Basic
         $redis = new RedisCacheService();
 
         $field = 'id,count_time,source,type,create_time,agent_id,total_fee,fee_item,purpose,status,site_id,status,bank,';
-        $field .= 'card_no,card_name,store_id';
+        $field .= 'card_no,card_name,store_id,office_id';
         $where['id'] = $this->params['id'];
         $data = $fee_model->findByOne($field, $where);
 
@@ -318,12 +318,17 @@ class Cost extends Basic
             case 1 :
                 $store_field = 'a.cost_id as id,a.assume_fee,a.store_attendance_num,c.store_name';
                 $cost_where['a.apply_for_id'] = $data['id'];
-                $data['store_cost_data'] = $m_store_cost_ext->getFeeStoreCost($store_field, $cost_where);
-
-                $ext_where['a.type'] = 1;
-                $ext_where['c.office_id'] = $data['office_id'];
-                $ext_where['b.setting_date'] = $data['count_time'];
-                $data['office_attendance_num'] = $m_store_cost_ext->getFeeOfficeCostSum('a.office_attendance_num', $ext_where);
+                $store_cost_data = $m_store_cost_ext->getFeeStoreCost($store_field, $cost_where);
+                if ($store_cost_data) {
+                    $data['store_cost_data'] =$store_cost_data;
+                }
+
+                if ($data['office_id']) {
+                    $ext_where['a.type'] = 1;
+                    $ext_where['c.office_id'] = $data['office_id'];
+                    $ext_where['b.setting_date'] = $data['count_time'];
+                    $data['office_attendance_num'] = $m_store_cost_ext->getFeeOfficeCostSum('a.office_attendance_num', $ext_where);
+                }
                 break;
             case 2 :
                 break;
@@ -335,7 +340,9 @@ class Cost extends Basic
                 $cost_ext_field = 'a.id,b.store_attendance_num,b.assume_fee';
                 $where_cost['apply_for_id'] = $data['id'];
                 $store_cost_data = $m_store_cost->getCostExt($cost_ext_field, $where_cost);
-                $data['store_cost_data'] = [$store_cost_data];
+                if ($store_cost_data) {
+                    $data['store_cost_data'] = [$store_cost_data];
+                }
                 break;
         }