mkm/work
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复前端添加任务后显示信息不全的问题

Browse Source 
Signed-off-by: vilson <545522390@qq.com>
This commit is contained in:
vilson 2019-03-08 09:49:27 +08:00
parent c9ac878f14
commit d27f9efa8c
1 changed files with 2 additions and 3 deletions

5
application/common/Model/Task.php

@ -293,8 +293,7 @@ class Task extends CommonModel
Db::rollback(); Db::rollback();
throw new \Exception($e->getMessage()); throw new \Exception($e->getMessage());
} }
unset($result['id']); return $this->read($result['code']);
return $result;
} }
public function taskDone($taskCode, $done) public function taskDone($taskCode, $done)
@ -591,7 +590,7 @@ class Task extends CommonModel
{ {
$done = 1; $done = 1;
if (isset($data['code']) && isset($data['pcode']) && $data['pcode']) { if (isset($data['code']) && isset($data['pcode']) && $data['pcode']) {
$task = self::where(['code' => $data['pcode']])->field('done')->find(); $task = self::where(['code' => $data['pcode']])->field('done,deleted')->find();
if ($task && !$task['deleted'] && !$task['done']) { if ($task && !$task['deleted'] && !$task['done']) {
$done = 0; $done = 0;
} }