From 3fee80770046fb0cf22fad3d663561dfe3d5a9ed Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 2 Sep 2019 16:45:34 +0800
Subject: [PATCH] * Finish task #6302.

---
 module/project/model.php          | 3 ++-
 module/project/view/team.html.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index e2302bc747..14702e843a 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1755,6 +1755,7 @@ class projectModel extends model
 
         $accounts = array_unique($accounts);
         $limited  = array_values($limited);
+        $oldJoin  = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq((int)$projectID)->andWhere('type')->eq('project')->fetchPairs();
         $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$projectID)->andWhere('type')->eq('project')->exec();
         foreach($accounts as $key => $account)
         {
@@ -1768,7 +1769,7 @@ class projectModel extends model
 
             $member->root    = (int)$projectID;
             $member->account = $account;
-            $member->join    = helper::today();
+            $member->join    = isset($oldJoin[$account]) ? $oldJoin[$account] : helper::today();
             $member->type    = 'project';
 
             $this->dao->insert(TABLE_TEAM)->data($member)->exec();
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php
index 5fdc59c604..99e7a460e1 100644
--- a/module/project/view/team.html.php
+++ b/module/project/view/team.html.php
@@ -67,7 +67,7 @@
           ?>
           </td>
           <td title='<?php echo $member->role;?>'><?php echo $member->role;?></td>
-          <td><?php echo substr($member->join, 2);?></td>
+          <td><?php echo $member->join;?></td>
           <td><?php echo $member->days . $lang->project->day;?></td>
           <td><?php echo $member->hours . $lang->project->workHour;?></td>
           <td><?php echo $memberHours . $lang->project->workHour;?></td>