From 9c3fa7bd75783eba43f18228238c6fd30bf59e93 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Wed, 30 Aug 2023 07:06:04 +0000
Subject: [PATCH]  * Adjust codes.

---
 module/testcase/control.php |  6 +++---
 module/testcase/zen.php     | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index d04bc3538c..ec5d16f2ca 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -977,9 +977,9 @@ class testcase extends control
 
         if($_POST)
         {
-            $fields = $this->testcaseZen->getExportFields();
-            $cases  = $this->testcase->getCasesToExport($this->post->exportType, $taskID, $orderBy, $limit);
-            $cases  = $this->testcaseZen->processCasesForExport();
+            $fields = $this->testcaseZen->getExportFields($product->type);
+            $cases  = $this->testcase->getCasesToExport($this->post->exportType, $taskID, $orderBy, $this->post->limit);
+            $cases  = $this->testcaseZen->processCasesForExport($cases, $productID, $taskID);
 
             if($this->config->edition != 'open') list($fields, $cases) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $cases);
 
diff --git a/module/testcase/zen.php b/module/testcase/zen.php
index 436e038643..d865e4b986 100644
--- a/module/testcase/zen.php
+++ b/module/testcase/zen.php
@@ -1618,17 +1618,18 @@ class testcaseZen extends testcase
      * 获取导出的字段列表。
      * Get the export fields.
      *
+     * @param  string    $productType
      * @access protected
      * @return array
      */
-    protected function getExportFields(): array
+    protected function getExportFields(string $productType): array
     {
         $fields = $this->post->exportFields ? $this->post->exportFields : explode(',', $this->config->testcase->exportFields);
         foreach($fields as $key => $fieldName)
         {
             $fieldName = trim($fieldName);
 
-            if($product->type != 'normal' || $fieldName != 'branch') $fields[$fieldName] = zget($this->lang->testcase, $fieldName);
+            if($productType != 'normal' || $fieldName != 'branch') $fields[$fieldName] = zget($this->lang->testcase, $fieldName);
 
             unset($fields[$key]);
         }
@@ -1640,11 +1641,12 @@ class testcaseZen extends testcase
      * 处理导出的用例数据。
      * Process export cases.
      *
+     * @param  array     $cases
      * @param  int       $taskID
      * @access protected
      * @return array
      */
-    protected function processCasesForExport(array $cases, int $taskID): array
+    protected function processCasesForExport(array $cases, int $productID, int $taskID): array
     {
         $products = $this->product->getPairs('', 0, '', 'all');
         $branches = $this->loadModel('branch')->getPairs($productID);
@@ -1654,8 +1656,8 @@ class testcaseZen extends testcase
         $relatedModules = $this->loadModel('tree')->getAllModulePairs('case');
         $relatedStories = $this->testcase->getRelatedStories($cases);
         $relatedCases   = $this->testcase->getRelatedCases($cases);
-        $relatedSteps   = $this->testcase->getReleatedSteps(array_keys($cases));
-        $relatedFiles   = $this->testcase->getRelatedSteps(array_keys($cases));
+        $relatedSteps   = $this->testcase->getRelatedSteps(array_keys($cases));
+        $relatedFiles   = $this->testcase->getRelatedFiles(array_keys($cases));
 
         if($taskID)
         {
@@ -1684,9 +1686,9 @@ class testcaseZen extends testcase
      * @param  array     $relatedSteps
      * @param  array     $relatedFiles
      * @access protected
-     * @return object
+     * @return void
      */
-    protected function processCaseForExport(object $case, array $products, array $branches, array $users, array $results, array $relatedModules, array $relatedStories,  array $relatedCases, array $relatedSteps, array $relatedFiles): object
+    protected function processCaseForExport(object $case, array $products, array $branches, array $users, array $results, array $relatedModules, array $relatedStories,  array $relatedCases, array $relatedSteps, array $relatedFiles): void
     {
         $case->stepDesc       = '';
         $case->stepExpect     = '';
@@ -1719,7 +1721,7 @@ class testcaseZen extends testcase
 
         $this->processStepForExport($case, $results, $relatedSteps);
         $this->processStageForExport($case);
-        $this->processFileForExportForExport($case, $relatedFiles);
+        $this->processFileForExport($case, $relatedFiles);
         if($case->linkCase) $this->processLinkCaseForExport($case);
     }