From 52cad31920548457b43c0633789d98b12d419aee Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 10 Aug 2022 12:37:14 +0800
Subject: [PATCH 1/3] * Code for port.

---
 db/update17.4.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/update17.4.sql b/db/update17.4.sql
index ff29c01259..c99338e4cc 100644
--- a/db/update17.4.sql
+++ b/db/update17.4.sql
@@ -28,4 +28,5 @@ UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource`
 UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource` WHERE `code`='feedbackSolution' ORDER BY `id` DESC LIMIT 1) WHERE `module`='feedback' AND `field`='solution';
 UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource` WHERE `code`='feedbackclosedReason' ORDER BY `id` DESC LIMIT 1), `control`='select' WHERE `module`='feedback' AND `field`='closedReason';
 
-UPDATE `zt_project` SET `closedDate`='' AND `closedBy`='' WHERE `status` != 'closed';
\ No newline at end of file
+UPDATE `zt_project` SET `closedDate`='' AND `closedBy`='' WHERE `status` != 'closed';
+UPDATE `zt_grouppriv` SET `method`='exportTemplate' WHERE `method` = 'exportTemplet';

From 3317e702039ac7c7cbbefa60c831f9c2c39b0bf4 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 10 Aug 2022 13:20:37 +0800
Subject: [PATCH 2/3] * Code for port.

---
 module/port/model.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/module/port/model.php b/module/port/model.php
index 4b4974ebcd..3e664c4401 100644
--- a/module/port/model.php
+++ b/module/port/model.php
@@ -600,28 +600,27 @@ class portModel extends model
         {
             foreach($values as $field => $value)
             {
-                if(empty($value)) continue;
                 if(in_array($field, $dataSourceList))
                 {
                     if($fieldList[$field]['control'] == 'multiple')
                     {
-                        $value = explode(',', $value);
                         $multiple = '';
-                        foreach($value as $tmpValue) $multiple .= "\n" . zget($exportDatas[$field], $tmpValue);
+                        $multipleLsit = explode(',', $value);
+                        foreach($multipleLsit as $tmpValue) $multiple .= "\n" . zget($exportDatas[$field], $tmpValue);
                         $rows[$id]->$field = $multiple;
                     }
                     else
                     {
-                        $rows[$id]->$field = zget($exportDatas[$field], $value);
+                        $rows[$id]->$field = zget($exportDatas[$field], $value, '');
                     }
                 }
                 elseif(strpos($this->config->port->userFields, $field) !== false)
                 {
-                    $rows[$id]->$field = zget($exportDatas['user'], $value);
+                    $rows[$id]->$field = zget($exportDatas['user'], $value, '');
                 }
 
                 /* if value = 0 or value = 0000:00:00 set value = ''*/
-                if(!$value or helper::isZeroDate($value))
+                if(helper::isZeroDate($value))
                 {
                     $rows[$id]->$field = '';
                 }

From 824b9219d905005495c949dca8db0eadeeb5278d Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 10 Aug 2022 13:34:57 +0800
Subject: [PATCH 3/3] * Code for gantt.

---
 module/common/view/gantt.html.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/common/view/gantt.html.php b/module/common/view/gantt.html.php
index ec81e3d8c0..76ec9eca20 100644
--- a/module/common/view/gantt.html.php
+++ b/module/common/view/gantt.html.php
@@ -16,6 +16,7 @@ if($currentLang != 'en') js::import($jsRoot . 'dhtmlxgantt/lang/' . $currentLang
 ?>
 <style>
 .gantt_message_area{display:none;}
+#ganttPris:hover{background:unset;color:unset;cursor: unset;}
 </style>
 <script>
 gantt.plugins({