diff --git a/application/common/Model/TaskStages.php b/application/common/Model/TaskStages.php
index aa6f026..c23fde2 100755
--- a/application/common/Model/TaskStages.php
+++ b/application/common/Model/TaskStages.php
@@ -104,14 +104,14 @@ class TaskStages extends CommonModel
     public function tasksTree($stageCode)
     {
         $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();
-        $list2 = $taskModel->where('stage_code', $stageCode)->where('done', 1)->where('deleted', 0)->order('sort asc,end_time desc, id asc')->select()->toArray();
-        $list = array_merge($list1, $list2);
+        $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();
+        $list = array_merge($list1?$list1->toArray():[],$list2?$list2->toArray():[]);
         if ($list) {
             foreach ($list as $key => &$item) {
                 $item = $taskModel->read($item['code']);
                 if ($item) {
-                    $item = $item->toArray();
+                    // $item = $item->toArray();
                 } else {
                     $item = [];
                 }