cfn
/
server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
zhang zhuo 2025-12-26 10:00:44 +08:00
parent 1096d26f14
commit 8aba3ad02c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/Admin/System.php
View File

@ -733,7 +733,7 @@ class System extends Base
{ {
$request = $this->container->get(ddRequest::class); $request = $this->container->get(ddRequest::class);
$request->scene('add')->validateResolved(); $request->scene('add')->validateResolved();
$data = Param::only(["dict_id", "dict_label", "dict_value", "is_default", "rank", "status", "remark"]); $data = Param::only(["dict_id", "dict_label", "dict_value", "is_default", "show_style", "rank", "status", "remark"]);
return $this->toAjax(ddModel::add($data)); return $this->toAjax(ddModel::add($data));
} }
@ -743,7 +743,7 @@ class System extends Base
{ {
$request = $this->container->get(ddRequest::class); $request = $this->container->get(ddRequest::class);
$request->scene('edit')->validateResolved(); $request->scene('edit')->validateResolved();
$data = Param::only(["data_id", "dict_id", "dict_label", "dict_value", "is_default", "rank", "status", "remark"]); $data = Param::only(["data_id", "dict_id", "dict_label", "dict_value", "is_default", "show_style", "rank", "status", "remark"]);
return $this->toAjax(ddModel::edit($data)); return $this->toAjax(ddModel::edit($data));
} }

5
app/Model/DictData.php
View File

@ -9,6 +9,7 @@ namespace App\Model;
* @property int $dict_id * @property int $dict_id
* @property string $dict_label * @property string $dict_label
* @property string $dict_value * @property string $dict_value
* @property string $show_style
* @property int $is_default * @property int $is_default
* @property int $rank * @property int $rank
* @property int $status * @property int $status
@ -49,7 +50,7 @@ class DictData extends Model
} }
return $model->orderByDesc("rank") return $model->orderByDesc("rank")
->orderByDesc("dict_id") ->orderByDesc("dict_id")
->select(["data_id", "dict_id", "dict_label", "dict_value", "is_default", "rank", "status", "remark", "create_time", "update_time"]) ->select(["data_id", "dict_id", "dict_label", "dict_value", "is_default", "show_style", "rank", "status", "remark", "create_time", "update_time"])
->paginate((int)$param['limit']); ->paginate((int)$param['limit']);
} }
@ -60,7 +61,7 @@ class DictData extends Model
->join('dict as d', 'd.dict_id', '=', 'da.dict_id') ->join('dict as d', 'd.dict_id', '=', 'da.dict_id')
->where('d.dict_type', $param['key']) ->where('d.dict_type', $param['key'])
->where('da.status', 1) ->where('da.status', 1)
->select(["da.dict_value", "da.dict_label", "da.is_default"]) ->select(["da.dict_value", "da.dict_label", "da.is_default", "show_style"])
->orderByDesc("da.rank") ->orderByDesc("da.rank")
->get() ->get()
->toArray(); ->toArray();