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-06 14:40:45 +08:00
parent e02627e558
commit 0574775a95
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,14 +104,14 @@ class TaskStages extends CommonModel
public function tasksTree($stageCode) public function tasksTree($stageCode)
{ {
$taskModel = new Task(); $taskModel = new Task();
$list1 = $taskModel->where('stage_code', $stageCode)->where('done', 0)->where('deleted', 0)->order('sort asc,end_time desc, id asc')->select()->toArray(); $list1 = $taskModel->where('stage_code', $stageCode)->where('done', 0)->where('deleted', 0)->order('sort asc,end_time desc, id asc')->select();
$list2 = $taskModel->where('stage_code', $stageCode)->where('done', 1)->where('deleted', 0)->order('sort asc,end_time desc, id asc')->select()->toArray(); $list2 = $taskModel->where('stage_code', $stageCode)->where('done', 1)->where('deleted', 0)->order('sort asc,end_time desc, id asc')->select();
$list = array_merge($list1, $list2); $list = array_merge($list1?$list1->toArray():[],$list2?$list2->toArray():[]);
if ($list) { if ($list) {
foreach ($list as $key => &$item) { foreach ($list as $key => &$item) {
$item = $taskModel->read($item['code']); $item = $taskModel->read($item['code']);
if ($item) { if ($item) {
$item = $item->toArray(); // $item = $item->toArray();
} else { } else {
$item = []; $item = [];
} }