|
@@ -109,7 +109,11 @@ class Maintain extends Apic
|
|
|
->join('user_company uc','mt.uc_id = uc.id','LEFT')
|
|
|
->field($field)
|
|
|
->where($map)->order('mt.id desc')
|
|
|
- ->autopage()->select();
|
|
|
+ ->paginate();
|
|
|
+
|
|
|
+ $total = $list->total();
|
|
|
+ $list = $list->items();
|
|
|
+
|
|
|
if(!empty($list)){
|
|
|
$maintain_model = new Maintainmodel();
|
|
|
foreach($list as $key => $val){
|
|
@@ -120,7 +124,12 @@ class Maintain extends Apic
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $this->success(1,$list);
|
|
|
+ $rs = [
|
|
|
+ 'list' => $list,
|
|
|
+ 'total'=> $total,
|
|
|
+ ];
|
|
|
+
|
|
|
+ $this->success(1,$rs);
|
|
|
}
|
|
|
|
|
|
//整合过的状态
|