From ee5aacbd35313fff184ad7672bee6ed58e2261ee Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 5 Jan 2023 10:05:45 +0800
Subject: [PATCH] * Fix bug#31467.

---
 module/bug/control.php | 2 +-
 module/file/model.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 7ab5ace364..e17eaabb5b 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -665,7 +665,7 @@ class bug extends control
         $this->view->storyID               = $storyID;
         $this->view->buildID               = $buildID;
         $this->view->caseID                = $caseID;
-        $this->view->resultFiles           = $resultID ? $this->loadModel('file')->getByObject('stepResult', $resultID) : array();
+        $this->view->resultFiles           = ($resultID and $stepIdList)? $this->loadModel('file')->getByObject('stepResult', $resultID, str_replace('_', ',', $stepIdList)) : array();
         $this->view->runID                 = $runID;
         $this->view->version               = $version;
         $this->view->testtask              = $testtask;
diff --git a/module/file/model.php b/module/file/model.php
index 7bca92a246..c0adf7d535 100755
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -46,7 +46,7 @@ class fileModel extends model
             ->where('objectType')->eq($objectType)
             ->andWhere('objectID')->in($objectID)
             ->andWhere('extra')->ne('editor')
-            ->beginIF($extra)->andWhere('extra')->eq($extra)
+            ->beginIF($extra)->andWhere('extra')->in($extra)->fi()
             ->andWhere('deleted')->eq('0')
             ->orderBy('id')
             ->fetchAll('id');