From 083ebb7f293dbb2a745a76ca82d4b6ad38e70c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Thu, 14 Jul 2022 13:29:09 +0800
Subject: [PATCH] * Fix stage-task tree list bug.

---
 module/execution/model.php     |  4 ++--
 module/project/js/execution.js |  1 +
 module/task/model.php          | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 8d8fe2e4d0..4d766499c6 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4327,13 +4327,13 @@ class executionModel extends model
         }
         else
         {
-            $trClass  = 'is-nest-child';
+            $trClass  = 'table-nest-hide';
             $trAttrs  = "data-id={$execution->id} data-parent={$execution->parent}";
             $trAttrs .= " data-nest-parent='$execution->parent' data-order='$execution->order' data-nest-path=',$execution->parent,$execution->id,'";
         }
 
         $burns = join(',', $execution->burns);
-        echo "<tr $trAttrs class=$trClass>";
+        echo "<tr $trAttrs class='$trClass'>";
         echo "<td><span id=$execution->id class='table-nest-icon icon table-nest-toggle'></span>";
         if($this->config->systemMode == 'new')
         {
diff --git a/module/project/js/execution.js b/module/project/js/execution.js
index 7e49d3e892..1209f65a01 100644
--- a/module/project/js/execution.js
+++ b/module/project/js/execution.js
@@ -31,6 +31,7 @@ function loadData($showmore)
 
     var executionID = $showmore.attr('data-parent');
     var maxTaskID   = $showmore.attr('data-id');
+    var maxTaskID   = maxTaskID.replace('t', '');
     var link = createLink('task', 'ajaxGetTasks', 'executionID=' + executionID + '&maxTaskID=' + maxTaskID);
     $.get(link, function(data)
     {
diff --git a/module/task/model.php b/module/task/model.php
index b2284e7174..3fc5896054 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3760,19 +3760,19 @@ class taskModel extends model
     public function buildNestedList($execution, $task, $isChild = false, $showmore = false, $users)
     {
         $showmore = $showmore ? 'showmore' : '';
-        $trAttrs  = "data-id=$task->id";
+        $trAttrs  = "data-id='t$task->id'";
         if(!$isChild)
         {
-            $path     = $execution->grade == 2 ? "$execution->parent,$execution->id,$task->id," : ",$execution->id,$task->id,";
-            $trAttrs .= " data-parent=$execution->id data-nest-parent=$execution->id data-nest-path=$path";
+            $path     = $execution->grade == 2 ? "$execution->parent,$execution->id,t$task->id," : ",$execution->id,t$task->id,";
+            $trAttrs .= " data-parent='$execution->id' data-nest-parent='$execution->id' data-nest-path='$path'";
             if(empty($task->children)) $trAttrs .= " data-nested='false'";
             $trClass  = empty($task->children) ? '' : " has-nest-child";
         }
         else
         {
-            $path     = $execution->grade == 2 ? "$execution->parent,$execution->id,$task->parent,$task->id," : ",$execution->id,$task->parent,$task->id,";
+            $path     = $execution->grade == 2 ? "$execution->parent,$execution->id,$task->parent,t$task->id," : ",$execution->id,$task->parent,t$task->id,";
             $trClass  = 'is-nest-child no-nest';
-            $trAttrs .= " data-nested='false' data-parent=$task->parent data-nest-parent=$task->parent data-nest-path=$path";
+            $trAttrs .= " data-nested='false' data-parent='t$task->parent' data-nest-parent='t$task->parent' data-nest-path='$path'";
         }
 
         $list  = "<tr $trAttrs class='$trClass $showmore'>";