Merge branch 'chat_0705' of https://gitee.com/zwyjjc/tl_estate into chat_0705

application/api_broker/service/OrderLogService.php

@@ -565,19 +565,6 @@ class OrderLogService
         a.estimated_receipt_date,a.submit_agent_name, a.price,a.commission,a.role,a.agent_id,a.scale,a.scale_fee,a.create_time,b.name,b.phone";
         $bargainData   = $oBargainModel->selectBargainListByOrderNo($field_bargain, [ "order_id" => $order_id ]);
         if (count($bargainData) > 0) {
-//            foreach ($bargainData as $k=>$v) {
-//                if ($v['father_id'] == 0) {
-//                    $sort++;
-//                    $result[$sort]['step_name'] = "bargain";
-//                    $result[$sort]['trade_type'] = $v['trade_type'];
-//                    $result[$sort]['house_number'] = $v['house_number'];
-//                    $result[$sort]['industry_type'] = $v['industry_type'];
-//                    $result[$sort]['price'] = $v['price'];
-//                    $result[$sort]['commission'] = $v['commission'];
-//                    $result[$sort]['is_open'] = $v['is_open'];
-//                }
-//            }
-
             $bargain_data_arr = $this->arr2TreeBargain($bargainData);
             foreach ($bargain_data_arr as $k2 => $v2) {
                 $v2["step_name"]  = "bargain";
@@ -640,7 +627,7 @@ class OrderLogService
                 $tree[$v["father_id"]]['is_open']       = $v['is_open'];
             }
 
-            $tree[$v["father_id"]]['list'][] = $v;
+            $tree[$v["father_id"]]['list_array'][] = $v;
         }
 
         return $tree;

application/chat/service/ChatService.php

@@ -209,6 +209,13 @@ class ChatService
         $userExt = new ChatUserExt();
 
         $where['only_id'] = $target;
+
+        if ($is_user) {
+            $where['type']    = 2;
+        } else {
+            $where['type']    = 1;
+        }
+
         $info             = $userExt->getChatUserExtByUserId($where, 'a.id,a.ext_id,a.device_id,a.push_id');
 
         if (count($info) <= 0) {

application/model/ChatUserExt.php

@@ -71,6 +71,10 @@ class ChatUserExt extends BaseModel
             $where_['a.is_forbidden'] = 0;
         }
 
+        if (isset($params['type'])) {
+            $where_['b.type'] = $params['type'];
+        }
+
         $data = $this->db->field($field)
             ->alias("a")
             ->join("chat_user b", "a.ext_id = b.id", "right")