|
@@ -838,8 +838,19 @@ class Admin extends Backend
|
|
|
public function export(){
|
|
|
|
|
|
$this->model = new \app\admin\model\department\AuthAdmin();
|
|
|
+ $filter = $this->request->get("filter", '');
|
|
|
+ $filter = (array)json_decode($filter, true);
|
|
|
+ $filter_w = [];
|
|
|
+ if (isset($filter['department_id'])) {
|
|
|
+ $department_id = $filter['department_id'];
|
|
|
+ unset($filter['department_id']);
|
|
|
+ $this->request->get(['filter' => json_encode($filter)]);
|
|
|
+ }
|
|
|
+ if ($department_id) {
|
|
|
+ $filter_w['depart_id'] = ['in', $department_id];
|
|
|
+ }
|
|
|
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
|
|
|
- $list = $this->model->where($where)->where(['depart_id'=>['>',0]])->order($sort, $order)->select();
|
|
|
+ $list = $this->model->where($where)->where(['depart_id'=>['>',0]])->where($filter_w)->order($sort, $order)->select();
|
|
|
|
|
|
$xlsName = '学员信息';
|
|
|
$this->exportExcel($xlsName,'Excel2007', $list);
|