From dff926542a68a4f2d7eeb6df9143a8acfff4b298 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Wed, 18 Aug 2021 19:15:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=A7=E5=93=81=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=8F=91=E5=B8=83=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/AdminAgent/Controllers/AgentProductController.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php
index b2e2a9c..5517043 100644
--- a/app/AdminAgent/Controllers/AgentProductController.php
+++ b/app/AdminAgent/Controllers/AgentProductController.php
@@ -198,19 +198,12 @@ class AgentProductController extends AdminController
 			$where = [
 				['agent_id', '=', $agent_id],
 				['product_id', '=', $form->product_id],
+				['product_ids', '=', $form->product_ids],
 			];
 			if ($form->isEditing()) {
 				$where[] = ['id', '<>', $form->getKey()];
 			}
-			$agent_product = $form->repository()->model()->withTrashed()->where($where)->first();
-			if ($agent_product) {
-				//如果已经软删除了，解除软删除后再更新
-				if ($agent_product->deleted_at) {
-					$agent_product->deleted_at = null;
-					$form->deleteInput('sale'); //保留原来的销量
-					$agent_product->update($form->input());
-					return $form->response()->success('保存成功')->script('history.back();');
-				}
+			if ($form->repository()->model()->where($where)->exists()) {
 				return $form->response()->error('该产品已经存在，请勿重复发布');
 			}
 		});