后台时间轴

application/index/service/UserLogService.php

@@ -170,19 +170,23 @@ class  UserLogService
      */
     public function userLog($user_id, $site_id, $type)
     {
+        $result = $this->orderService->selectListByUserIdAndSiteId($user_id, '', $site_id);
         switch ($type){
             case 1:
-                $oReportModel = new OReportModel();
-                $field_report = "a.id,a.create_time,a.predict_see_time,a.intro,b.id as order_id
-                ,b.house_id,b.house_title,c.id as agent_id,c.name,c.img";
-               return $oReportModel->getReport($field_report, ["user_id" => $user_id]);
+                if(count($result) > 0){
+                    return $result[0];
+                }else{
+                    return null;
+                }
+
             case 2:
-                return $this->orderService->selectListByUserIdAndSiteId($user_id, '', $site_id);
+                return $result;
             default:
                 return null;
                 break;
         }
 
+
     }
 
     /**