From 9d64406d9e863fbd4f60d985c31f4021df209949 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Mon, 11 Nov 2024 10:00:46 +0800
Subject: [PATCH] * [task#131813,doing,0.5h] adjust approval data logic for my
 module.

---
 module/my/config.php | 10 ++++++++++
 module/my/model.php  |  8 ++++++--
 module/my/tao.php    |  6 ++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/module/my/config.php b/module/my/config.php
index 03932ac8d5..3da7c0d587 100644
--- a/module/my/config.php
+++ b/module/my/config.php
@@ -17,3 +17,13 @@ $config->mobile->todoBar  = array('today', 'yesterday', 'thisWeek', 'lastWeek',
 $config->mobile->taskBar  = array('assignedTo', 'openedBy');
 $config->mobile->bugBar   = array('assignedTo', 'openedBy', 'resolvedBy');
 $config->mobile->storyBar = array('assignedTo', 'openedBy', 'reviewedBy');
+
+$config->my->notFlowModules = array();
+
+$config->my->openedDateField['product']     = 'createdDate';
+$config->my->openedDateField['productplan'] = 'createdDate';
+$config->my->openedDateField['release']     = 'createdDate';
+$config->my->openedDateField['build']       = 'createdDate';
+$config->my->openedDateField['testtask']    = 'createdDate';
+$config->my->openedDateField['testsuite']   = 'addedDate';
+$config->my->openedDateField['caselib']     = 'addedDate';
diff --git a/module/my/model.php b/module/my/model.php
index d97e86eade..8f40b4707c 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -1190,8 +1190,12 @@ class myModel extends model
         $objectGroup = array();
         foreach($objectIdList as $objectType => $idList)
         {
-            if(!isset($flows[$objectType])) continue;
-            $table = zget($this->config->objectTables, $objectType, $flows[$objectType]->table);
+            $table = zget($this->config->objectTables, $objectType, '');
+            if(!in_array($objectType, $this->config->my->notFlowModules))
+            {
+                if(!isset($flows[$objectType])) continue;
+                if(!$table) $table = $flows[$objectType]->table;
+            }
             if(empty($table)) continue;
 
             $objectGroup[$objectType] = $this->dao->select('*')->from($table)->where('id')->in($idList)->fetchAll('id');
diff --git a/module/my/tao.php b/module/my/tao.php
index 9d6d630ee1..b7465ba4f1 100644
--- a/module/my/tao.php
+++ b/module/my/tao.php
@@ -298,9 +298,7 @@ class myTao extends myModel
         {
             $title           = '';
             $titleFieldName  = zget($objectNameFields, $objectType, '');
-            $openedDateField = 'openedDate';
-            if(in_array($objectType, array('product', 'productplan', 'release', 'build', 'testtask'))) $openedDateField = 'createdDate';
-            if(in_array($objectType, array('testsuite', 'caselib')))$openedDateField = 'addedDate';
+            $openedDateField = zget($this->config->my->openedDateField, $objectType, 'openedDate');
             if(empty($titleFieldName) && isset($flows[$objectType]))
             {
                 if(!empty($flows[$objectType]->titleField)) $titleFieldName = $flows[$objectType]->titleField;
@@ -316,7 +314,7 @@ class myTao extends myModel
                 $data->type   = $objectType;
                 $data->time   = $object->{$openedDateField};
                 $data->status = 'doing';
-                $data->app    = $flows[$objectType]->app;
+                $data->app    = isset($flows[$objectType]->app) ? $flows[$objectType]->app : zget($this->lang->navGroup, $objectType, '');
                 $approvalList[] = $data;
             }
         }