diff --git a/app/admin/controller/SysDictController.php b/app/admin/controller/SysDictController.php index 6e54cd7..4fa9852 100644 --- a/app/admin/controller/SysDictController.php +++ b/app/admin/controller/SysDictController.php @@ -2,8 +2,10 @@ namespace app\admin\controller; use app\common\controller\BaseController; +use app\common\model\SysDictItem; use app\common\traits\crud\CrudControllerTrait; use app\admin\service\SysDictService; +use support\Request; class SysDictController extends BaseController { @@ -22,12 +24,26 @@ class SysDictController extends BaseController * @param array $data * @return array */ - // protected function indexFormat($data) - // { - // if (isset($data['created_at'])) - // $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); - // if (isset($data['updated_at'])) - // $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); - // return $data; - // } + protected function indexFormat($data) + { + if (isset($data['sysDictItem'])) + $data['sysDictItem'] = SysDictItem::where('dict_id',$data['id'])->get(); + if (isset($data['created_at'])) + $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + if (isset($data['updated_at'])) + $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + + return $data; + } + /** + * 列表页数据格式化 + * + * @param array $data + * @return array + */ + protected function showFormat($data) + { + $data['sysDictItem'] = SysDictItem::where('dict_id',$data['id'])->get(); + return $data; + } } \ No newline at end of file