Skip to content

灵活的主键设置 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: v2
Choose a base branch
from
Open

灵活的主键设置 #35

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
497c2bb
灵活的主键设置
tianheng2017 Aug 5, 2020
a9d31a0
使用$this->model->getPk()代替写死的id主键
tianheng2017 Aug 15, 2020
8996b68
Update Curd.php
tianheng2017 Aug 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions app/admin/traits/Curd.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ public function add()
/**
* @NodeAnotation(title="编辑")
*/
public function edit($id)
public function edit()
{
$row = $this->model->find($id);
$row = $this->model->find($this->request->param($this->model->getPk()));
empty($row) && $this->error('数据不存在');
if ($this->request->isAjax()) {
$post = $this->request->post();
Expand All @@ -99,9 +99,9 @@ public function edit($id)
/**
* @NodeAnotation(title="删除")
*/
public function delete($id)
public function delete()
{
$row = $this->model->whereIn('id', $id)->select();
$row = $this->model->whereIn($this->model->getPk(), $this->request->param($this->model->getPk()))->select();
$row->isEmpty() && $this->error('数据不存在');
try {
$save = $row->delete();
Expand Down Expand Up @@ -131,7 +131,7 @@ public function export()
$list = $this->model
->where($where)
->limit(100000)
->order('id', 'desc')
->order($this->model->getPk(), 'desc')
->select()
->toArray();
$fileName = time();
Expand All @@ -145,12 +145,12 @@ public function modify()
{
$post = $this->request->post();
$rule = [
'id|ID' => 'require',
'field|字段' => 'require',
'value|值' => 'require',
$this->model->getPk().'|主键' => 'require',
'field|字段' => 'require',
'value|值' => 'require',
];
$this->validate($post, $rule);
$row = $this->model->find($post['id']);
$row = $this->model->find($post[$this->model->getPk()]);
if (!$row) {
$this->error('数据不存在');
}
Expand Down