From 85fb3b10048c152b891a64c4e4bc689ba3593019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E6=96=B0=E6=89=8D?= <maxincai@126.com>
Date: Thu, 21 Oct 2021 22:53:24 +0800
Subject: [PATCH] =?UTF-8?q?[Bug=E4=BF=AE=E5=A4=8D](1.1.5):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=B5=81=E5=A4=B1=E6=8F=90=E9=86=92=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E6=98=B5=E7=A7=B0=E5=8F=8A=E5=A4=B4=E5=83=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Contract/WorkContactContract.php             |  3 ++-
 .../core/work-contact/src/Logic/LossContactLogic.php |  2 +-
 .../work-contact/src/Service/WorkContactService.php  | 12 ++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/api-server/app/core/work-contact/src/Contract/WorkContactContract.php b/api-server/app/core/work-contact/src/Contract/WorkContactContract.php
index 6030bab4..a604e5aa 100644
--- a/api-server/app/core/work-contact/src/Contract/WorkContactContract.php
+++ b/api-server/app/core/work-contact/src/Contract/WorkContactContract.php
@@ -24,9 +24,10 @@ public function getWorkContactById(int $id, array $columns = ['*']): array;
      * 查询多条 - 根据ID.
      * @param array $ids ID
      * @param array|string[] $columns 查询字段
+     * @param bool $withTrashed 是否包含软删除
      * @return array 数组
      */
-    public function getWorkContactsById(array $ids, array $columns = ['*']): array;
+    public function getWorkContactsById(array $ids, array $columns = ['*'], bool $withTrashed = false): array;
 
     /**
      * 多条分页.
diff --git a/api-server/app/core/work-contact/src/Logic/LossContactLogic.php b/api-server/app/core/work-contact/src/Logic/LossContactLogic.php
index fa943cbd..82576192 100644
--- a/api-server/app/core/work-contact/src/Logic/LossContactLogic.php
+++ b/api-server/app/core/work-contact/src/Logic/LossContactLogic.php
@@ -286,7 +286,7 @@ private function getEmployee($employeeIds)
      */
     private function getContact($contactIds)
     {
-        $contact = $this->contact->getWorkContactsById($contactIds, ['id', 'name', 'avatar']);
+        $contact = $this->contact->getWorkContactsById($contactIds, ['id', 'name', 'avatar'], true);
         if (empty($contact)) {
             return [];
         }
diff --git a/api-server/app/core/work-contact/src/Service/WorkContactService.php b/api-server/app/core/work-contact/src/Service/WorkContactService.php
index 90a1202b..94f5a634 100644
--- a/api-server/app/core/work-contact/src/Service/WorkContactService.php
+++ b/api-server/app/core/work-contact/src/Service/WorkContactService.php
@@ -45,11 +45,19 @@ public function getWorkContactById(int $id, array $columns = ['*']): array
      * 查询多条 - 根据ID.
      * @param array $ids ID
      * @param array|string[] $columns 查询字段
+     * @param bool $withTrashed 是否包含软删除
      * @return array 数组
      */
-    public function getWorkContactsById(array $ids, array $columns = ['*']): array
+    public function getWorkContactsById(array $ids, array $columns = ['*'], bool $withTrashed = false): array
     {
-        return $this->model->getAllById($ids, $columns);
+        $query = $this->model::newModel();
+        if ($withTrashed) {
+            $query = $query->withTrashed();
+        }
+
+        $data = $query->find($ids, $columns);
+        $data || $data = collect([]);
+        return $data->toArray();
     }
 
     /**