diff --git a/application/common/Model/TaskStages.php b/application/common/Model/TaskStages.php index 554b7b8..24e31f4 100755 --- a/application/common/Model/TaskStages.php +++ b/application/common/Model/TaskStages.php @@ -46,9 +46,9 @@ class TaskStages extends CommonModel if (is_array($stageCode)) { $taskModel = $taskModel->whereIn('t.stage_code', $stageCode); } else { - if (isset($data['type']) && $data['type'] != 'all'){ + if ($data['type'] != 'all'){ $taskModel = $taskModel->where('t.stage_code', $stageCode); - }elseif(isset($data['type']) && $data['type'] == 'all'){ + }elseif($data['type'] == 'all'){ if(isset($data['type_name'])){ $code =Db::name('task_stages')->where('name',$data['type_name'])->where('deleted',0)->column('code'); $taskModel = $taskModel->whereIn('t.stage_code', $code); @@ -89,12 +89,12 @@ class TaskStages extends CommonModel } else { if ($find && $find['is_liaison_man'] == 0) { $joinTaskMember = true; - // $type = ProjectAuth::where('id', $find['authorize'])->value('type'); - // if ($type == 'admin') { - // $taskModel = $taskModel->where('t.create_by', $member_code); - // } else { + $type = ProjectAuth::where('id', $find['authorize'])->value('type'); + if ($type == 'admin') { + $taskModel = $taskModel->where('t.create_by', $member_code); + } else { $taskModel = $taskModel->leftJoin('task_member tm', 't.code = tm.task_code')->where('tm.member_code', $member_code)->where('tm.is_executor', 1); - // } + } } }