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-09 11:38:20 +08:00
parent c15e44eadf
commit ece1f6540c
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

@ -82,7 +82,7 @@ class TaskStages extends CommonModel
!$joinTaskMember && $taskModel->leftJoin('task_member tm', 't.code = tm.task_code'); !$joinTaskMember && $taskModel->leftJoin('task_member tm', 't.code = tm.task_code');
$taskModel = $taskModel->whereIn('tm.member_code', $joiner); $taskModel = $taskModel->whereIn('tm.member_code', $joiner);
} }
$list = $taskModel->order('t.sort asc,t.id asc')->field('id', true)->select(); $list = $taskModel->order('t.sort asc,t.id asc')->field('id', true)->select();
if ($list) { if ($list) {
$taskMemberList = []; $taskMemberList = [];
foreach ($list as &$task) { foreach ($list as &$task) {

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

@ -97,7 +97,7 @@ class Task extends BasicApi
$taskInfo = \app\common\Model\Task::get($task['id']); $taskInfo = \app\common\Model\Task::get($task['id']);
$task['parentDone'] = $taskInfo['parentDone']; $task['parentDone'] = $taskInfo['parentDone'];
$task['hasUnDone'] = $taskInfo['hasUnDone']; $task['hasUnDone'] = $taskInfo['hasUnDone'];
$task['priText'] = $status[$task['pri']]; $task['priText'] = $status[$task['pri']??0];
$task['executor'] = Member::where(['code' => $task['assign_to']])->field('name,avatar')->find(); $task['executor'] = Member::where(['code' => $task['assign_to']])->field('name,avatar')->find();
$task['projectInfo'] = \app\common\Model\Project::where(['code' => $task['project_code']])->field('name,code')->find(); $task['projectInfo'] = \app\common\Model\Project::where(['code' => $task['project_code']])->field('name,code')->find();
} }