bug

application/index/service/UserLogService.php

@@ -12,6 +12,7 @@ use app\model\ASite;
 use app\model\GOperatingRecords;
 use app\model\OReportModel;
 use app\model\UPhoneFollowUp;
+use app\model\UPhoneFollowUpTemporary;
 use app\model\Users;
 
 /**
@@ -202,12 +203,17 @@ class  UserLogService
     {
         // $userParams["type"] = 0; //电话跟进  $userParams["type"] = 1; //普通跟进
         $uPhoneFollowModel = new UPhoneFollowUp($site_id);
+        $uPhoneFollowTempModel = new UPhoneFollowUpTemporary($site_id);
         //电话跟进
         $userParams["user_id"] = $user_id;
 
         $field_user_follow = "a.id,a.content,a.user_id,a.agent_id,a.type,a.create_time,a.user_status,b.name,b.phone,b.img";
-        $bargainData = $uPhoneFollowModel->getFollowUpList($field_user_follow, $userParams,$page_no,$page_size);
 
+        $bargainData = $uPhoneFollowTempModel->getFollowList($page_no,$page_size,"",$field_user_follow, $userParams);
+        if(count($bargainData) <= 0){
+            $bargainData = $uPhoneFollowModel->getFollowUpList($field_user_follow, $userParams,$page_no,$page_size);
+
+        }
         return $bargainData;
     }
 

application/task/controller/FollowUpTask.php

@@ -136,4 +136,5 @@ class FollowUpTask
         }
 
     }
-}
+}
\ No newline at end of file
+