From ffd355d0a360edb92c2796873e86d517e24ca780 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Mon, 9 Jul 2018 14:42:04 +0800
Subject: [PATCH 1/2]  * Finish task #4502.

---
 module/company/css/browse.css       | 2 ++
 module/company/view/browse.html.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/company/css/browse.css b/module/company/css/browse.css
index 444231a3e9..6d15f602ad 100644
--- a/module/company/css/browse.css
+++ b/module/company/css/browse.css
@@ -2,3 +2,5 @@
 form {position:relative}
 #querybox {float: none!important; width: auto;}
 #moreOrLite {right: 10px!important}
+
+#userList tbody td{white-space: nowrap; overflow:hidden}
diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index dc61a8fd7c..a9d2b644de 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -70,7 +70,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
           </th>
           <th><?php common::printorderlink('realname', $orderBy, $vars, $lang->user->realname);?></th>
           <th><?php common::printOrderLink('account', $orderBy, $vars, $lang->user->account);?></th>
-          <th class="c-type"><?php common::printOrderLink('role', $orderBy, $vars, $lang->user->role);?></th>
+          <th class="w-90px"><?php common::printOrderLink('role', $orderBy, $vars, $lang->user->role);?></th>
           <th class="c-url"><?php common::printOrderLink('email', $orderBy, $vars, $lang->user->email);?></th>
           <th class="c-type"><?php common::printOrderLink('gender', $orderBy, $vars, $lang->user->gender);?></th>
           <th><?php common::printOrderLink('phone', $orderBy, $vars, $lang->user->phone);?></th>
@@ -92,7 +92,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
           </td>
           <td><?php if(!common::printLink('user', 'view', "account=$user->account", $user->realname, '', "title='$user->realname'")) echo $user->realname;?></td>
           <td><?php echo $user->account;?></td>
-          <td class="c-type"><?php echo zget($lang->user->roleList, $user->role, '');?></td>
+          <td class="w-90px" title='<?php echo zget($lang->user->roleList, $user->role, '');?>'><?php echo zget($lang->user->roleList, $user->role, '');?></td>
           <td class="c-url" title="<?php echo $user->email;?>"><?php echo html::mailto($user->email);?></td>
           <td class="c-type"><?php echo zget($lang->user->genderList, $user->gender, $user->gender);?></td>
           <td><?php echo $user->phone;?></td>

From e9edde159c144ce3748c3ad8132dc9a921190409 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Mon, 9 Jul 2018 14:56:28 +0800
Subject: [PATCH 2/2]  * Fix bug for finish multiple task, fix bug #1872.

---
 module/task/model.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 309523e03d..7f0efdf5ac 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1123,7 +1123,7 @@ class taskModel extends model
             ->setDefault('status', 'done')
             ->setDefault('finishedBy, lastEditedBy', $this->app->user->account)
             ->setDefault('finishedDate, lastEditedDate', $now)
-            ->removeIF(!empty($oldTask->team), 'finishedBy,finishedDate,status')
+            ->removeIF(!empty($oldTask->team), 'finishedBy,finishedDate,status,left')
             ->remove('comment,files,labels')
             ->get();
 
@@ -1145,8 +1145,8 @@ class taskModel extends model
         }
         else
         {
-            $consumed = $oldTask->team[$this->app->user->account]->consumed;
-            if($task->consumed < $consumed)
+            $consumed = $task->consumed - $oldTask->team[$this->app->user->account]->consumed;
+            if($consumed < 0)
             {
                 dao::$errors[] = $this->lang->task->error->consumedSmall;
                 return false;