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

修复无法正常完成任务的问题、版本更新至2.2.5

Browse Source 
Signed-off-by: vilson <545522390@qq.com>
This commit is contained in:
vilson 2019-03-07 14:32:30 +08:00
parent b78c16e325
commit c9ac878f14
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/common/Model/Task.php
View File

@ -568,6 +568,7 @@ class Task extends CommonModel
} }
return $tags; return $tags;
} }
/** /**
* 子任务数 * 子任务数
*/ */
@ -591,7 +592,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')->find();
if ($task && !$task['done']) { if ($task && !$task['deleted'] && !$task['done']) {
$done = 0; $done = 0;
} }
} }
@ -605,7 +606,7 @@ class Task extends CommonModel
{ {
$hasUnDone = 0; $hasUnDone = 0;
if (isset($data['code'])) { if (isset($data['code'])) {
$taskCount = self::where(['pcode' => $data['code'], 'done' => 0])->count('id'); $taskCount = self::where(['pcode' => $data['code'], 'done' => 0, 'deleted' => 0])->count('id');
if ($taskCount) { if ($taskCount) {
$hasUnDone = 1; $hasUnDone = 1;
} }

2
config/app.php
View File

@ -6,7 +6,7 @@ return [
// 应用名称 // 应用名称
'app_name' => 'pearProject', 'app_name' => 'pearProject',
// 应用版本 // 应用版本
'app_version' => '2.2.4', 'app_version' => '2.2.5',
// 应用地址 // 应用地址
'app_host' => '', 'app_host' => '',
// 应用调试模式 // 应用调试模式