diff --git a/application/common/Model/Task.php b/application/common/Model/Task.php index 767e17c..d70e4a6 100644 --- a/application/common/Model/Task.php +++ b/application/common/Model/Task.php @@ -397,7 +397,11 @@ class Task extends CommonModel $offset = ($page - 1) * $page; $limit = $pageSize; $prefix = config('database.prefix'); - $sql = "select *,t.id as id,t.name as name,t.code as code from {$prefix}task as t join {$prefix}project as p on t.project_code = p.code where t.done = {$done} and t.deleted = 0 and t.assign_to = '{$memberCode}' and p.deleted = 0 order by t.id desc"; + $doneSql = ''; + if ($done != -1) { + $doneSql = " and t.done = {$done}"; + } + $sql = "select *,t.id as id,t.name as name,t.code as code from {$prefix}task as t join {$prefix}project as p on t.project_code = p.code where t.deleted = 0 {$doneSql} and t.assign_to = '{$memberCode}' and p.deleted = 0 order by t.id desc"; $total = Db::query($sql); $total = count($total); $sql .= " limit {$offset},{$limit}"; diff --git a/application/project/controller/Project.php b/application/project/controller/Project.php index 5c3e5e7..eff8cc4 100644 --- a/application/project/controller/Project.php +++ b/application/project/controller/Project.php @@ -103,7 +103,7 @@ class Project extends BasicApi } /** - * 获取自己的任务 + * 获取自己的项目 * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\ModelNotFoundException * @throws \think\exception\DbException @@ -111,7 +111,12 @@ class Project extends BasicApi public function selfList() { $type = Request::post('type'); - $member = getCurrentMember(); + $memberCode = Request::post('memberCode', ''); + if (!$memberCode) { + $member = getCurrentMember(); + } else { + $member = Member::where(['code' => $memberCode])->find(); + } $deleted = 1; if (!$type) { $deleted = 0; diff --git a/application/project/controller/Task.php b/application/project/controller/Task.php index 9181238..de61f49 100644 --- a/application/project/controller/Task.php +++ b/application/project/controller/Task.php @@ -81,12 +81,18 @@ class Task extends BasicApi */ public function selfList() { - $type = Request::post('type'); - $member = getCurrentMember(); + $type = Request::post('type', 0); + $memberCode = Request::post('memberCode', ''); + if (!$memberCode) { + $member = getCurrentMember(); + } else { + $member = Member::where(['code' => $memberCode])->find(); + } $done = 1; if (!$type) { $done = 0; } + $type == -1 && $done = $type; $list = $this->model->getMemberTasks($member['code'], $done, Request::post('page'), Request::post('pageSize')); if ($list['list']) { foreach ($list['list'] as &$task) {