gx

@@ -24,6 +24,7 @@ class ManagerLogController extends BaseController
      * @time   :2023/9/5 16:10
      * @time   :2023/9/5 16:10
      */
      */
     public function lists(LoginLog $manageLogin){
     public function lists(LoginLog $manageLogin){
+        $this->map = $this->searchParam();
         $lists = $manageLogin->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $manageLogin->lists($this->map,$this->page,$this->row,$this->order);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             $managerModel = new Manage();
             $managerModel = new Manage();
@@ -38,4 +39,24 @@ class ManagerLogController extends BaseController
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
+    /**
+     * @remark :搜索参数
+     * @name   :searchParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/5 16:56
+     */
+    public function searchParam(){
+        $map = [];
+        $managerModel = new Manage();
+        if(isset($this->param['mobile']) && !empty($this->param['mobile'])){
+            $ids = $managerModel->where('mobile', 'like', '%' . $this->map['mobile'] . '%')->pluck('id')->toArray();
+            $map['manage_id'] = ['in',$ids];
+        }elseif (isset($this->param['name']) && !empty($this->param['name'])){
+            $ids = $managerModel->where('name', 'like', '%' . $this->map['name'] . '%')->pluck('id')->toArray();
+            $map['manage_id'] = ['in',$ids];
+        }
+        return $map;
+    }
+
 }
 }

@@ -30,7 +30,7 @@ class UserLoginController extends BaseController
             $userModel = new User();
             $userModel = new User();
             $managerModel = new Manage();
             $managerModel = new Manage();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                $info = $userModel->read(['id'=>$v['manager_id']]);
+                $info = $userModel->read(['id'=>$v['user_id']]);
                 $v['mobile'] = $info['mobile'] ?? '';
                 $v['mobile'] = $info['mobile'] ?? '';
                 $v['type'] = ($v['type'] == 0) ? '用户登录' : '管理员登录';
                 $v['type'] = ($v['type'] == 0) ? '用户登录' : '管理员登录';
                 if(!empty($v['remark'])){
                 if(!empty($v['remark'])){
@@ -40,6 +40,7 @@ class UserLoginController extends BaseController
                         $v['remark'] = $arr[0].':'.$managerInfo['name'];
                         $v['remark'] = $arr[0].':'.$managerInfo['name'];
                     }
                     }
                 }
                 }
+                $lists['list'][$k] = $v;
             }
             }
         }
         }
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);