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

更新

Browse Source
This commit is contained in:
mkm 2024-01-17 16:43:46 +08:00
parent 96e8b32063
commit 057509f0bc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/common/Model/TaskStages.php
View File

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