From a13f8cd4c0df9cd0137fe0e31c4f3f65bcce6c04 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Tue, 3 Nov 2020 17:26:51 +0800
Subject: [PATCH] * Adjust the logic of the assigned to.

---
 module/task/control.php         | 9 +++++++--
 module/task/view/start.html.php | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index cb18eb20b7..cb5aa720ac 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -738,11 +738,16 @@ class task extends control
             die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
         }
 
+        $users      = $this->loadModel('user')->getPairs('noletter');
+        $members    = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
+        $assignedTo = in_array(zget($this->app->user->account, $users), $members) === TRUE ? $this->app->user->account : '';
+
         $this->view->title      = $this->view->project->name . $this->lang->colon .$this->lang->task->start;
         $this->view->position[] = $this->lang->task->start;
 
-        $this->view->members    = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
-        $this->view->users      = $this->loadModel('user')->getPairs('noletter');
+        $this->view->users      = $users;
+        $this->view->members    = $members;
+        $this->view->assignedTo = $task->assignedTo == '' ? $assignedTo : $task->assignedTo;
         $this->display();
     }
 
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index 70fc5c50ce..8c8520f4a9 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -42,7 +42,7 @@
         <tr>
           <th class='w-90px'><?php echo $lang->task->assignedTo;?></th>
           <td class='w-p25-f'>
-            <?php echo html::select('assignedTo', $members, $this->app->user->account, "class='form-control chosen'");?>
+            <?php echo html::select('assignedTo', $members, $assignedTo, "class='form-control chosen'");?>
           </td>
           <td></td>
         </tr>