Merge branch 'develop_bm' into feature/mzl_dev

# Conflicts:
#	app/controller/IndexController.php
#	config/route.php
This commit is contained in:
mzl
2025-09-01 14:06:34 +08:00
parent 29f573a467
commit b3d8029e6d
69 changed files with 3283 additions and 0 deletions
@@ -0,0 +1,54 @@
<?php
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
{
use CrudControllerTrait;
protected $service;
public function __construct()
{
$this->service = new SysDictService();
}
/**
* 列表页数据格式化
*
* @param array $data
* @return array
*/
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)
{
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']);
$data['sysDictItem'] = SysDictItem::where('dict_id',$data['id'])->get();
return $data;
}
}