From 59af2053bcb521f7d2e17bbc32f0d0771a33aeae Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 10 Oct 2019 11:26:32 +0800
Subject: [PATCH] * Finish task #6386.

---
 module/block/control.php                | 14 +++++++++++++-
 module/block/view/productblock.html.php |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index ffb3c3522d..a16ca26ac6 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -713,8 +713,20 @@ class block extends control
         $pager = pager::init(0, $num , 1);
 
         $productStats  = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type);
+        $projects      = $this->loadModel('project')->getPairs();
         $productIdList = array();
-        foreach($productStats as $product) $productIdList[] = $product->id;
+        $this->loadModel('action');
+        foreach($productStats as $product)
+        {
+            $currentProjectID = $this->dao->select('objectID')->from(TABLE_ACTION)
+                ->where('objectType')->eq('project')
+                ->andWhere('action')->eq('managed')
+                ->andWhere("CONCAT(extra, ',,')")->like("%$product->id,,")
+                ->orderBy('id_desc')
+                ->fetch('objectID');
+            $product->currentProject = zget($projects, $currentProjectID, '');
+            $productIdList[] = $product->id;
+        }
 
         $this->view->projects = $this->dao->select('t1.product,t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php
index 7f2b3cab12..d6d00ede50 100644
--- a/module/block/view/productblock.html.php
+++ b/module/block/view/productblock.html.php
@@ -39,8 +39,8 @@
       <tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
         <td class='c-name text-left' title='<?php echo $product->name?>'><?php echo $product->name?></td>
         <?php if($longBlock):?>
-        <?php $projectName = zget($projects, $product->id, '');?>
-        <td class='c-name c-project text-left' title='<?php echo $projectName;?>'><?php echo zget($projects, $product->id, '');?></td>
+        <?php $projectName = $product->currentProject ? $product->currentProject : zget($projects, $product->id, '');?>
+        <td class='c-name c-project text-left' title='<?php echo $projectName;?>'><?php echo $projectName;?></td>
         <?php endif;?>
         <td class="c-num"><?php echo $product->plans?></td>
         <td class="c-num"><?php echo $product->releases?></td>