From 7b8a6c2a4c9168b14aae5386e938e1e41aea1dde Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 27 Apr 2022 16:00:55 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=A7=BB=E4=BA=A4=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=92=8C=E4=BB=BB=E5=8A=A1=E6=97=B6=E8=AE=B0=E5=BD=95=E8=A2=AB?=
 =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/ProjectTaskUser.php                   |  4 ++--
 app/Models/ProjectUser.php                       |  4 ++--
 .../js/pages/manage/components/ProjectLog.vue    | 16 ++++++++++------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/Models/ProjectTaskUser.php b/app/Models/ProjectTaskUser.php
index 5e2e39d3b..3a1d36211 100644
--- a/app/Models/ProjectTaskUser.php
+++ b/app/Models/ProjectTaskUser.php
@@ -46,7 +46,7 @@ class ProjectTaskUser extends AbstractModel
      */
     public static function transfer($originalUserid, $newUserid)
     {
-        self::whereUserid($originalUserid)->chunk(100, function ($list) use ($newUserid) {
+        self::whereUserid($originalUserid)->chunk(100, function ($list) use ($originalUserid, $newUserid) {
             $tastIds = [];
             /** @var self $item */
             foreach ($list as $item) {
@@ -62,7 +62,7 @@ class ProjectTaskUser extends AbstractModel
                     $item->save();
                 }
                 if ($item->projectTask) {
-                    $item->projectTask->addLog("移交{任务}身份给", ['userid' => [$newUserid]]);
+                    $item->projectTask->addLog("移交{任务}身份", ['userid' => [$originalUserid, ' => ',$newUserid]]);
                     if (!in_array($item->task_pid, $tastIds)) {
                         $tastIds[] = $item->task_pid;
                         $item->projectTask->syncDialogUser();
diff --git a/app/Models/ProjectUser.php b/app/Models/ProjectUser.php
index dfcf4e185..45c6af251 100644
--- a/app/Models/ProjectUser.php
+++ b/app/Models/ProjectUser.php
@@ -46,7 +46,7 @@ class ProjectUser extends AbstractModel
      */
     public static function transfer($originalUserid, $newUserid)
     {
-        self::whereUserid($originalUserid)->chunkById(100, function ($list) use ($newUserid) {
+        self::whereUserid($originalUserid)->chunkById(100, function ($list) use ($originalUserid, $newUserid) {
             /** @var self $item */
             foreach ($list as $item) {
                 $row = self::whereProjectId($item->project_id)->whereUserid($newUserid)->first();
@@ -61,7 +61,7 @@ class ProjectUser extends AbstractModel
                     $item->save();
                 }
                 if ($item->project) {
-                    $item->project->addLog("移交项目身份给", ['userid' => $newUserid]);
+                    $item->project->addLog("移交项目身份", ['userid' => [$originalUserid, ' => ',$newUserid]]);
                     $item->project->syncDialogUser();
                 }
             }
diff --git a/resources/assets/js/pages/manage/components/ProjectLog.vue b/resources/assets/js/pages/manage/components/ProjectLog.vue
index 5011a0607..d64d2fb82 100644
--- a/resources/assets/js/pages/manage/components/ProjectLog.vue
+++ b/resources/assets/js/pages/manage/components/ProjectLog.vue
@@ -184,12 +184,16 @@ export default {
                     let userids = $A.isArray(record.userid) ? record.userid : [record.userid]
                     let userNode = [];
                     userids.some(userid => {
-                        userNode.push(h('UserAvatar', {
-                            props: {
-                                size: 18,
-                                userid
-                            }
-                        }))
+                        if (/\d+/.test(userid)) {
+                            userNode.push(h('UserAvatar', {
+                                props: {
+                                    size: 18,
+                                    userid
+                                }
+                            }))
+                        } else {
+                            userNode.push(h('span', userid))
+                        }
                     })
                     if (userNode.length > 0) {
                         vNode.push(h('div', {