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-13 09:37:17 +08:00
parent 5c91fef393
commit 1c80c028ad
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ class TaskStages extends CommonModel
$taskModel = $taskModel->where('t.create_by',$member_code);
}else{
if(isset($data['type']) &&$data['type']=='copied_list'){
$taskModel = $taskModel->whereFindInSet('t.copied_list', $member_code);
$taskModel = $taskModel->whereRaw('find_in_set(t.copied_list ,:id) ', ['id' => $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);
}

2
application/project/controller/TaskStages.php
View File

@ -83,7 +83,7 @@ class TaskStages extends BasicApi
$this->error("数据解析异常");
}
$where[] = ['stage_code', '=', $code];
$data[] = ['type'=>$type];
$data = ['type'=>$type];
$list = $this->model->tasks($code, 0, $done, $title, $pri, $executor, $creator, $joiner, $status, $endTime, $beginTime, $createTime, $doneTime,$data);
// $list = \app\common\Model\Task::alias('t')->join('member m','t.assign_to = m.code')->field()->where(['stage_code'=>$code])->select();