From 2bbb4df7700b60b2b515803ff636aa726b156595 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 31 Aug 2022 20:29:26 +0800
Subject: [PATCH] * Code for task#66954.

---
 module/file/model.php    | 10 +++++-----
 module/upgrade/model.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/file/model.php b/module/file/model.php
index 7bfcb9b720..d664584737 100755
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -46,8 +46,8 @@ class fileModel extends model
             ->where('objectType')->eq($objectType)
             ->andWhere('objectID')->eq((int)$objectID)
             ->andWhere('extra')->ne('editor')
-            ->beginIF($objectType == 'story' and $extra)->andWhere('extra')->like("%,$extra,%")->fi()
-            ->beginIF($objectType != 'story' and $extra)->andWhere('extra')->eq($extra)->fi()
+            ->beginIF(strpos('story,requirement', $objectType) !== false and $extra)->andWhere('extra')->like("%,$extra,%")->fi()
+            ->beginIF(strpos('story,requirement', $objectType) === false and $extra)->andWhere('extra')->eq($extra)->fi()
             ->andWhere('deleted')->eq('0')
             ->orderBy('id')
             ->fetchAll('id');
@@ -1133,7 +1133,7 @@ class fileModel extends model
     {
         $oldStoryVersion = $storyVersion - 1;
         $this->dao->update(TABLE_FILE)->set("extra = CONCAT(extra, '$storyVersion,')")
-            ->where('objectType')->eq('story')
+            ->where('objectType')->in('story,requirement')
             ->andWhere('objectID')->eq($storyID)
             ->andWhere('extra')->like("%,$oldStoryVersion,%")
             ->beginIF(!empty($deleteFiles))->andWhere('id')->notin($deleteFiles)->fi()
@@ -1152,7 +1152,7 @@ class fileModel extends model
     public function deleteStoryFile($storyID, $storyVersion, $deleteFiles = array())
     {
         $deleteFileList = $this->dao->select('*')->from(TABLE_FILE)
-            ->where('objectType')->eq('story')
+            ->where('objectType')->in('story,requirement')
             ->andWhere('objectID')->eq($storyID)
             ->andWhere('extra')->eq(",$storyVersion,")
             ->beginIF(!empty($deleteFiles))->andWhere('id')->in($deleteFiles)->fi()
@@ -1171,7 +1171,7 @@ class fileModel extends model
 
         /* When the file is in multiple story versions, 'extra' need delete the version to be deleted. */
         $this->dao->update(TABLE_FILE)->set("extra = REPLACE(extra, '$storyVersion,', '')")
-            ->where('objectType')->eq('story')
+            ->where('objectType')->in('story,requirement')
             ->andWhere('objectID')->eq($storyID)
             ->andWhere('extra')->like("%,$storyVersion,%")
             ->beginIF(!empty($deleteFiles))->andWhere('id')->in($deleteFiles)->fi()
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 8194c63ac3..375693aa78 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -7216,7 +7216,7 @@ class upgradeModel extends model
      */
     public function updateStoryFile()
     {
-        $storyFileList = $this->dao->select('*')->from(TABLE_FILE)->where('objectType')->eq('story')->andWhere('extra')->ne('editor')->fetchAll('id');
+        $storyFileList = $this->dao->select('*')->from(TABLE_FILE)->where('objectType')->in('story,requirement')->andWhere('extra')->ne('editor')->fetchAll('id');
 
         /* Get story version. */
         $storyIDList = array();