1

application/api_broker/controller/OfficeHomePageLog.php

@@ -13,6 +13,7 @@ use app\model\AAgents;
 use app\model\GHouses;
 use app\model\GHousesFollowUp;
 use app\model\OfficeGHousesFollowUp;
+use app\model\OfficeGRoom;
 use app\model\OfficeUPhoneFollowUp;
 use app\model\ULabels;
 use app\model\UPhoneFollowUp;
@@ -261,14 +262,6 @@ class OfficeHomePageLog extends Basic
         $order         = "f.id desc";
         $result        = $this->gHouseFollowUpModel->getSearch($pageNo, $pageSize, $order, $field, $where_, "");
         foreach ($result as $key => $value) {
-//            $agent_params               = [];
-//            $agent_params["a.id"]       = $value['agent_id'];
-//            $agent_field                = "a.name,a.img,b.store_name";
-//            $model                      = new AAgents();
-//            $res_a                      = $model->getAgentsInfo($agent_field, $agent_params);
-//            $result[$key]['name']       = $res_a[0]['name'];
-//            $result[$key]['img']        = $res_a[0]['img'];
-//            $result[$key]['store_name'] = $res_a[0]['store_name'];
             if ($value['agent_id']) {
                 $agent_data                 = $redis_service->getRedisCache(2, $value['agent_id']);
                 $result[$key]['name']       = $agent_data['name'];
@@ -279,16 +272,12 @@ class OfficeHomePageLog extends Basic
                 $result[$key]['img']        = [];
                 $result[$key]['store_name'] = [];
             }
-
-            $house_params                   = [];
-            $house_params["id"]             = $value['house_id'];
-            $house_field                    = "internal_title";
-            $model                          = new GHouses();
-            $res_a                          = $model->getHouseInfo($house_field, $house_params);
+            $roomModel = new OfficeGRoom();
+            $house_params["a.id"] = $value['house_id'];
+            $res_a = $roomModel->getHouseInfo("a.id,CONCAT(b.address,a.room_number) internal_address", $house_params);
             $result[$key]['internal_title'] = $res_a[0]['internal_title'];
 
         }
-        //$count = $this->gHouseFollowUpModel->getSearchCount( $where_);
         if (count($result) > 0) {
             $list["result"]   = $result;
             $list["img_path"] = AGENTHEADERIMGURL;