From a46ac38561a7e482663ffd16195726be51771773 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 26 Apr 2022 10:36:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E4=BB=BB=E5=8A=A1=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
 =?UTF-8?q?=E6=88=96=E5=8D=8F=E5=8A=A9=E4=BA=BA=E5=91=98=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/ProjectTask.php                    |  4 +-
 ...4_26_110223_project_logs_record_userid.php | 45 +++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 database/migrations/2022_04_26_110223_project_logs_record_userid.php

diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
index 891ea1171..8f514bbb2 100644
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -682,7 +682,7 @@ class ProjectTask extends AbstractModel
                 }
                 $rows = ProjectTaskUser::whereTaskId($this->id)->whereOwner(1)->whereNotIn('userid', $array)->get();
                 if ($rows->isNotEmpty()) {
-                    $this->addLog("删除{任务}负责人", ['userid' => $rows->implode('userid', ',')]);
+                    $this->addLog("删除{任务}负责人", ['userid' => $rows->pluck('userid')]);
                     foreach ($rows as $row) {
                         $row->delete();
                     }
@@ -793,7 +793,7 @@ class ProjectTask extends AbstractModel
                     }
                     $rows = ProjectTaskUser::whereTaskId($this->id)->whereOwner(0)->whereNotIn('userid', $array)->get();
                     if ($rows->isNotEmpty()) {
-                        $this->addLog("删除{任务}协助人员", ['userid' => $rows->implode('userid', ',')]);
+                        $this->addLog("删除{任务}协助人员", ['userid' => $rows->pluck('userid')]);
                         foreach ($rows as $row) {
                             $row->delete();
                         }
diff --git a/database/migrations/2022_04_26_110223_project_logs_record_userid.php b/database/migrations/2022_04_26_110223_project_logs_record_userid.php
new file mode 100644
index 000000000..ef30b5d09
--- /dev/null
+++ b/database/migrations/2022_04_26_110223_project_logs_record_userid.php
@@ -0,0 +1,45 @@
+<?php
+
+@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+
+use App\Models\ProjectLog;
+use App\Module\Base;
+use Illuminate\Database\Migrations\Migration;
+
+class ProjectLogsRecordUserid extends Migration
+{
+    /**
+     * 处理日志格式
+     *
+     * @return void
+     */
+    public function up()
+    {
+        ProjectLog::whereIn('detail', [
+            '删除任务负责人',
+            '删除子任务负责人',
+            '删除任务协助人员',
+            '删除子任务协助人员',
+        ])->chunkById(100, function ($lists) {
+            /** @var ProjectLog $log */
+            foreach ($lists as $log) {
+                $record = $log->record;
+                if (is_string($record['userid']) && str_contains($record['userid'], ",")) {
+                    $record['userid'] = Base::explodeInt(',', $record['userid']);
+                    $log->record = Base::array2json($record);
+                    $log->save();
+                }
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}