From 154ace870a0f09daae98e8ea2ef62828198cb4b9 Mon Sep 17 00:00:00 2001
From: z <wyd621@163.com>
Date: Thu, 12 Nov 2020 09:25:13 +0800
Subject: [PATCH]  * finish task #8265.

---
 db/update12.4.4.sql     | 10 ++++++++++
 module/action/model.php |  4 ++--
 module/story/model.php  |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/db/update12.4.4.sql b/db/update12.4.4.sql
index 9420b34a14..6db33edf22 100644
--- a/db/update12.4.4.sql
+++ b/db/update12.4.4.sql
@@ -1,3 +1,13 @@
 ALTER TABLE `zt_doc` ADD `mailto` text  AFTER `editedDate`;
 ALTER TABLE `zt_task` CHANGE `realStarted` `realStarted` datetime NOT NULL AFTER `estStarted`;
 ALTER TABLE `zt_group` CHANGE `program` `PRJ` mediumint(8) unsigned NOT NULL DEFAULT 0;
+
+ALTER TABLE `zt_notify` ADD INDEX `objectType_toList_status` (`objectType`, `toList`, `status`);
+ALTER TABLE `zt_user` ADD INDEX `deleted` (`deleted`);
+ALTER TABLE `zt_case` ADD INDEX `fromBug` (`fromBug`);
+ALTER TABLE `zt_bug` ADD INDEX `toStory` (`toStory`);
+ALTER TABLE `zt_task` ADD INDEX `parent` (`parent`);
+ALTER TABLE `zt_bug` ADD INDEX `result` (`result`);
+ALTER TABLE `zt_history` ADD INDEX `action` (`action`);
+ALTER TABLE `zt_action` ADD INDEX `action` (`action`);
+ALTER TABLE `zt_action` DROP INDEX `product`;
diff --git a/module/action/model.php b/module/action/model.php
index 472b9489ce..6dc58b77dd 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -209,11 +209,11 @@ class actionModel extends model
         $actions   = $this->dao->select('*')->from(TABLE_ACTION)
             ->beginIF($objectType == 'project')
             ->where("objectType IN('project', 'testtask', 'build')")
-            ->andWhere('project')->eq($objectID)
+            ->andWhere('project')->eq((int)$objectID)
             ->fi()
             ->beginIF($objectType != 'project')
             ->where('objectType')->eq($objectType)
-            ->andWhere('objectID')->eq($objectID)
+            ->andWhere('objectID')->eq((int)$objectID)
             ->fi()
             ->orderBy('date, id')->fetchAll('id');
         $histories = $this->getHistory(array_keys($actions));
diff --git a/module/story/model.php b/module/story/model.php
index a780ad6614..6ae15356f0 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2050,8 +2050,8 @@ class storyModel extends model
             ->leftJoin(TABLE_PROJECTSTORY)->alias('t2')->on('t1.id=t2.story')
             ->where($sql)
             ->beginIF($productID != 'all' and $productID != '')->andWhere('t1.`product`')->eq((int)$productID)->fi()
-            ->andWhere('deleted')->eq(0)
-            ->andWhere('type')->eq($type)
+            ->andWhere('t1.deleted')->eq(0)
+            ->andWhere('t1.type')->eq($type)
             ->orderBy($orderBy)
             ->page($pager, 't1.id')
             ->fetchAll('id');