|
|
@@ -55,7 +55,7 @@ class Res extends Backend
|
|
|
[$where, $sort, $order, $offset, $limit] = $this->buildparams();
|
|
|
$user_id = Session::get('admin')['id'];
|
|
|
if ($user_id == 1){//超级管理员
|
|
|
- $list = $this->model->alias('a')
|
|
|
+ $list = $this->model
|
|
|
->where($where)
|
|
|
->order($sort, $order)
|
|
|
->paginate($limit);
|
|
|
@@ -78,11 +78,6 @@ class Res extends Backend
|
|
|
->order($sort, $order)
|
|
|
->paginate($limit);
|
|
|
}
|
|
|
- foreach ($list->items() as $k=>$v){
|
|
|
- $data = Db::name('entrust')->where('sample_no',$list->items()[$k]['sample_no'])->find();
|
|
|
- $list->items()[$k]['sample_info'] = $data['sample_info'];
|
|
|
- $list->items()[$k]['send_sample'] = $data['send_sample'];
|
|
|
- }
|
|
|
$result = ['total' => $list->total(), 'rows' => $list->items()];
|
|
|
return json($result);
|
|
|
}
|