From 51862e041009b7affc18a74304d6e8e104a2c09a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Sat, 15 Jan 2022 09:55:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=B7=9F=E8=BF=9B=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/manager/controller/UserFollow.php | 15 ++++++++++++++-
 fastphp/base/Model.php                | 14 ++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/manager/controller/UserFollow.php b/app/manager/controller/UserFollow.php
index 5bd437a..ae045ea 100644
--- a/app/manager/controller/UserFollow.php
+++ b/app/manager/controller/UserFollow.php
@@ -5,7 +5,7 @@
  * @Author: kangkang
  * @Date: 2020-10-13 19:52:37
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2022-01-14 16:24:59
+ * @LastEditTime: 2022-01-15 09:54:06
  */
 
 namespace app\manager\controller;
@@ -284,8 +284,21 @@ class UserFollow extends Controller
         if (!empty($get['s_time'])) {
             $date1 = date('Y-m-d', strtotime($get['s_time']));
             $date2 = date('Y-m-d H:i:s', strtotime($get['e_time']));
+            if (!empty($where)) {
+                $where .= " AND ";
+            }
             $where .= " create_time>='" . $date1 . "' and create_time<='" . $date2 . "' ";
         }
+        //根据会员信息查询
+        if (!empty($get['search_info'])) {
+            $user_model = new User;
+            $user_where = "LoginCode = '".$get['search_info']."' OR Wx = '".$get['search_info']."' OR QQ = '".$get['search_info']."'";
+            $user_id = $user_model->getOneByStr($user_where, 'Id');
+            if (!empty($where)) {
+                $where .= " AND ";
+            }
+            $where .= " user_id=".$user_id['Id'].' ';
+        }
         $list = $follow_rcord->getNewRecord($where,"$page,50");
 
         foreach ($list as &$info) {
diff --git a/fastphp/base/Model.php b/fastphp/base/Model.php
index d15a7d8..d1106ab 100644
--- a/fastphp/base/Model.php
+++ b/fastphp/base/Model.php
@@ -2,8 +2,8 @@
 /*
  * @Author: your name
  * @Date: 2020-09-30 17:32:46
- * @LastEditTime: 2020-11-17 15:17:09
- * @LastEditors: kangkang
+ * @LastEditTime: 2022-01-15 09:41:34
+ * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /phptest/fastphp/base/Model.php
  */
@@ -71,6 +71,16 @@ class Model extends Sql
     {
         return $this->field($fields)->where($where)->fetch();
     }
+    
+    /**
+     * @description: 获取一条数据
+     * @param {type}
+     * @return {type}
+     */
+    public function getOneByStr($where = "", $fields = '*')
+    {
+        return $this->field($fields)->where($where)->fetch();
+    }
 
     /**
      * @description: 获取最新一条数据