|
@@ -35,7 +35,7 @@ class DeptController extends Curd
|
|
|
[$where, $format, $limit, $field, $order] = $this->selectInput($request);
|
|
|
$format = 'tree';
|
|
|
$order = $request->get('order', 'desc');
|
|
|
- $field = $field ?? 'dept_sort';
|
|
|
+ $field = $field ?? 'dept_addTime';
|
|
|
$where['dept_is_del'] = 0;
|
|
|
$query = $this->doSelect($where, $field, $order);
|
|
|
return $this->doFormat($query, $format, $limit);
|
|
@@ -96,7 +96,7 @@ class DeptController extends Curd
|
|
|
$model->{$key} = $val;
|
|
|
}
|
|
|
// 上级
|
|
|
- if ($model->dept_pid != 0){
|
|
|
+ if ($model->dept_pid != 0) {
|
|
|
$superior = $this->model->getByPrimaryKey($model->dept_pid);
|
|
|
$model->dept_path = $superior->dept_path . $model->dept_id . '/';
|
|
|
}
|
|
@@ -157,8 +157,8 @@ class DeptController extends Curd
|
|
|
'dept_name' => $item->dept_name,
|
|
|
'dept_type' => $item->dept_type,
|
|
|
'dept_sort' => $item->dept_sort,
|
|
|
- 'dept_addTime' => $item->dept_addTime,
|
|
|
- 'dept_updateTime' => $item->dept_updateTime
|
|
|
+ 'dept_addTime' => date("Y-m-d H:i:s", strtotime($item->dept_addTime)),
|
|
|
+ 'dept_updateTime' => date("Y-m-d H:i:s", strtotime($item->dept_updateTime))
|
|
|
];
|
|
|
}
|
|
|
$tree = new Tree($format_items);
|