|
...
|
...
|
@@ -25,7 +25,6 @@ class ManagerLogController extends BaseController |
|
|
|
*/
|
|
|
|
public function lists(LoginLog $manageLogin){
|
|
|
|
$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();
|
|
...
|
...
|
@@ -57,6 +56,9 @@ class ManagerLogController extends BaseController |
|
|
|
$ids = $managerModel->where('name', 'like', '%' . $this->map['name'] . '%')->pluck('id')->toArray();
|
|
|
|
$map['manage_id'] = ['in',$ids];
|
|
|
|
}
|
|
|
|
if(isset($this->map['created_at'])){
|
|
|
|
$map['created_at'] = $this->map['created_at'];
|
|
|
|
}
|
|
|
|
return $map;
|
|
|
|
}
|
|
|
|
|
...
|
...
|
|