gx

@@ -24,8 +24,9 @@ class ManagerLogController extends BaseController
      * @time   :2023/9/5 16:10
      */
     public function lists(LoginLog $manageLogin){
-        $this->map = $this->searchParam();
-        $lists = $manageLogin->lists($this->map,$this->page,$this->row,$this->order);
+        $map = $this->searchParam();
+        $map['created_at'] = $this->map['created_at'];
+        $lists = $manageLogin->lists($map,$this->page,$this->row,$this->order);
         if(!empty($lists) && !empty($lists['list'])){
             $managerModel = new Manage();
             foreach ($lists['list'] as $k => $v){

@@ -25,7 +25,9 @@ class UserLoginController extends BaseController
      * @time   :2023/9/5 16:10
      */
     public function lists(UserLogin $user){
-        $lists = $user->lists($this->map,$this->page,$this->row,$this->order);
+        $map = $this->searchParam();
+        $map['created_at'] = $this->map['created_at'];
+        $lists = $user->lists($map,$this->page,$this->row,$this->order);
         if(!empty($lists) && !empty($lists['list'])){
             $userModel = new User();
             $managerModel = new Manage();
@@ -35,15 +37,47 @@ class UserLoginController extends BaseController
                 $v['name'] = $info['name'] ?? '';
                 $v['type'] = ($v['type'] == 0) ? '用户登录' : '管理员登录';
                 if(!empty($v['remark'])){
-                    $arr = explode('：',$v['remark']);
-                    $managerInfo = $managerModel->read(['id'=>$arr[1]]);
-                    if($managerInfo !== false){
-                        $v['remark'] = $arr[0].'：'.$managerInfo['name'];
-                    }
+                    $v['remark'] = $this->handleRemark($managerModel,$v['remark']);
                 }
                 $lists['list'][$k] = $v;
             }
         }
         $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;
+    }
+
+    /**
+     * @remark :处理备注
+     * @name   :handleRemark
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/5 17:21
+     */
+    public function handleRemark(&$managerModel,$remark){
+        $arr = explode('：',$remark);
+        $managerInfo = $managerModel->read(['id'=>$arr[1]]);
+        if($managerInfo !== false){
+            $remark = $arr[0].'：'.$managerInfo['name'];
+        }
+        return $remark;
+    }
 }