正在显示
2 个修改的文件
包含
6 行增加
和
2 行删除
| @@ -25,7 +25,6 @@ class ManagerLogController extends BaseController | @@ -25,7 +25,6 @@ class ManagerLogController extends BaseController | ||
| 25 | */ | 25 | */ |
| 26 | public function lists(LoginLog $manageLogin){ | 26 | public function lists(LoginLog $manageLogin){ |
| 27 | $map = $this->searchParam(); | 27 | $map = $this->searchParam(); |
| 28 | - $map['created_at'] = $this->map['created_at']; | ||
| 29 | $lists = $manageLogin->lists($map,$this->page,$this->row,$this->order); | 28 | $lists = $manageLogin->lists($map,$this->page,$this->row,$this->order); |
| 30 | if(!empty($lists) && !empty($lists['list'])){ | 29 | if(!empty($lists) && !empty($lists['list'])){ |
| 31 | $managerModel = new Manage(); | 30 | $managerModel = new Manage(); |
| @@ -57,6 +56,9 @@ class ManagerLogController extends BaseController | @@ -57,6 +56,9 @@ class ManagerLogController extends BaseController | ||
| 57 | $ids = $managerModel->where('name', 'like', '%' . $this->map['name'] . '%')->pluck('id')->toArray(); | 56 | $ids = $managerModel->where('name', 'like', '%' . $this->map['name'] . '%')->pluck('id')->toArray(); |
| 58 | $map['manage_id'] = ['in',$ids]; | 57 | $map['manage_id'] = ['in',$ids]; |
| 59 | } | 58 | } |
| 59 | + if(isset($this->map['created_at'])){ | ||
| 60 | + $map['created_at'] = $this->map['created_at']; | ||
| 61 | + } | ||
| 60 | return $map; | 62 | return $map; |
| 61 | } | 63 | } |
| 62 | 64 |
| @@ -26,7 +26,6 @@ class UserLoginController extends BaseController | @@ -26,7 +26,6 @@ class UserLoginController extends BaseController | ||
| 26 | */ | 26 | */ |
| 27 | public function lists(UserLogin $user){ | 27 | public function lists(UserLogin $user){ |
| 28 | $map = $this->searchParam(); | 28 | $map = $this->searchParam(); |
| 29 | - $map['created_at'] = $this->map['created_at']; | ||
| 30 | $lists = $user->lists($map,$this->page,$this->row,$this->order); | 29 | $lists = $user->lists($map,$this->page,$this->row,$this->order); |
| 31 | if(!empty($lists) && !empty($lists['list'])){ | 30 | if(!empty($lists) && !empty($lists['list'])){ |
| 32 | $userModel = new User(); | 31 | $userModel = new User(); |
| @@ -62,6 +61,9 @@ class UserLoginController extends BaseController | @@ -62,6 +61,9 @@ class UserLoginController extends BaseController | ||
| 62 | $ids = $managerModel->where('name', 'like', '%' . $this->map['name'] . '%')->pluck('id')->toArray(); | 61 | $ids = $managerModel->where('name', 'like', '%' . $this->map['name'] . '%')->pluck('id')->toArray(); |
| 63 | $map['manage_id'] = ['in',$ids]; | 62 | $map['manage_id'] = ['in',$ids]; |
| 64 | } | 63 | } |
| 64 | + if(isset($this->map['created_at'])){ | ||
| 65 | + $map['created_at'] = $this->map['created_at']; | ||
| 66 | + } | ||
| 65 | return $map; | 67 | return $map; |
| 66 | } | 68 | } |
| 67 | 69 |
-
请 注册 或 登录 后发表评论