From 73c0f94b50c93efa58a8290fa1ca3b2b52751a8a Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 18 Jan 2024 18:18:25 +0800
Subject: [PATCH] * Fix bug #44387.

---
 module/story/model.php      | 3 +++
 module/testtask/control.php | 3 +++
 module/testtask/model.php   | 7 +++++++
 3 files changed, 13 insertions(+)

diff --git a/module/story/model.php b/module/story/model.php
index a45f1dd7dc..400c255107 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -7026,6 +7026,7 @@ class storyModel extends model
         $storyIDList  = array();
         foreach($objects as $object)
         {
+            if($this->app->rawModule == 'testtask') $object->id = $object->case;
             $objectIDList[] = $object->id;
             if($objectType == 'story') $storyIDList[] = $object->id;
             if($objectType != 'story') $storyIDList[] = $object->story;
@@ -7067,6 +7068,8 @@ class storyModel extends model
         foreach($objects as $object)
         {
             $confirmed = array();
+
+            if($this->app->rawModule == 'testtask') $object->id = $object->case;
             if(isset($actions[$object->id])) $confirmed = $actions[$object->id]; // 已经确认的用户需求
 
             if($objectType == 'story' and isset($confirmObjects[$object->id]))
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 2c1c4a8018..0e4d996420 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -562,9 +562,12 @@ class testtask extends control
 
         /* Get test cases. */
         $runs = $this->testtask->getTaskCases($productID, $browseType, $queryID, $moduleID, $sort, $pager, $task);
+        if($this->config->edition == 'ipd') $runs = $this->loadModel('story')->getAffectObject($runs, 'case');
+
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
         $runs = $this->loadModel('story')->checkNeedConfirm($runs);
 
+
         $case2RunMap = array();
         foreach($runs as $run) $case2RunMap[$run->case] = $run->id;
 
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 3845ff6fdc..0d25d114cd 100755
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1965,6 +1965,13 @@ class testtaskModel extends model
                 break;
             case 'actions':
                 if($isScene) break;
+                if(!empty($run->retractConfirm))
+                {
+                    $retractObject = join(',', $run->retractObject);
+                    common::printIcon('testcase', 'confirmDemandRetract', "objectID=$run->case&object=case&extra=$retractObject", $run, 'list', 'search', '', 'iframe', true);
+                    break;
+                }
+
                 if($run->caseStatus != 'wait' and $caseChanged)
                 {
                     common::printIcon('testcase', 'confirmChange', "id=$run->case&taskID=$run->task&from=list", $run, 'list', 'search', 'hiddenwin');