From d1f11b72d8854504bbf120aef52132b00afbf65d Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 28 Oct 2022 14:08:53 +0800
Subject: [PATCH]  * fix bug #29065.

---
 module/my/view/audit.html.php | 4 ++--
 module/product/model.php      | 5 +++--
 module/program/model.php      | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/module/my/view/audit.html.php b/module/my/view/audit.html.php
index 7f0ec701a4..3d9d3bc8a4 100644
--- a/module/my/view/audit.html.php
+++ b/module/my/view/audit.html.php
@@ -40,7 +40,7 @@
         <th class='c-title text-left'><?php $rawMethod == 'contribute' ? print($lang->my->auditField->title) : common::printOrderLink('title', $orderBy, $vars, $lang->my->auditField->title);?></th>
         <th class='c-type w-120px'>   <?php common::printOrderLink('type', $orderBy, $vars, $lang->my->auditField->type);?></th>
         <th class='c-date w-150px'>   <?php common::printOrderLink('time', $orderBy, $vars, $lang->my->auditField->time);?></th>
-        <?php if($rawMethod == 'contribute'):?>
+        <?php if($rawMethod == 'contribute' and $browseType == 'reviewedbyme'):?>
         <th class='c-status w-150px'> <?php print($lang->my->auditField->result);?></th>
         <?php endif;?>
         <th class='c-status w-110px'> <?php $rawMethod == 'contribute' ? print($lang->my->auditField->status) : common::printOrderLink('status', $orderBy, $vars, $lang->my->auditField->status);?></th>
@@ -81,7 +81,7 @@
         </td>
         <td class='c-type'><?php echo $typeName;?></td>
         <td class='c-time text-left'><?php echo $review->time?></td>
-        <?php if($rawMethod == 'contribute'):?>
+        <?php if($rawMethod == 'contribute' and $browseType == 'reviewedbyme'):?>
         <?php
         $reviewResultList = zget($lang->$type, 'reviewResultList', array());
         if(strpos(",{$config->my->oaObjectType},", ",$type,") !== false) $reviewResultList = zget($lang->$type, 'reviewStatusList', array());
diff --git a/module/product/model.php b/module/product/model.php
index 4cfed74124..6a4b431092 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -602,8 +602,8 @@ class productModel extends model
 
     /**
      * Get products group by program.
-     * 
-     * @param  array  $appendIDList 
+     *
+     * @param  array  $appendIDList
      * @access public
      * @return array
      */
@@ -1980,6 +1980,7 @@ class productModel extends model
             ->beginIF(!$this->app->user->admin)->andWhere('t1.project')->in($this->app->user->view->sprints)->fi()
             ->andWhere('t1.product')->in(array_keys($productList))
             ->andWhere('status')->eq('doing')
+            ->andWhere('multiple')->ne('0')
             ->andWhere('deleted')->eq('0')
             ->orderBy('id_desc')
             ->fetchGroup('project', 'id');
diff --git a/module/program/model.php b/module/program/model.php
index 0d4521d416..e68fb18fa8 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -350,6 +350,7 @@ class programModel extends model
             ->where('type')->in('sprint,stage,kanban')
             ->andWhere('status')->eq('doing')
             ->andWhere('deleted')->eq(0)
+            ->andWhere('multiple')->ne(0)
             ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
             ->orderBy('id_asc')
             ->fetchAll('project');