From 4239e590694987fe9e8e47e44c8a97772e579387 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 22 Feb 2024 09:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=94=AF=E4=B8=80=E9=94=AE=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=EF=BC=9A=E4=BB=A3=E7=90=86=20-=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=94=A8=E6=88=B7=E5=90=8C=E6=97=B6=E6=8B=A5?=
 =?UTF-8?q?=E6=9C=89=E5=A4=9A=E4=B8=AA=E7=9B=B8=E5=90=8C=E7=9A=84=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/marketing/AgentDao.php                 | 2 +-
 app/common/model/marketing/Agent.php                  | 9 ---------
 app/common/repositories/marketing/AgentRepository.php | 2 --
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/common/dao/marketing/AgentDao.php b/app/common/dao/marketing/AgentDao.php
index 4223334..bb78438 100644
--- a/app/common/dao/marketing/AgentDao.php
+++ b/app/common/dao/marketing/AgentDao.php
@@ -79,7 +79,7 @@ class AgentDao extends BaseDao{
                 },
             ])
             ->order('create_time DESC,id DESC')
-            ->append(['only_key','mer_id_list','children_count','agent_type_text']);
+            ->append(['mer_id_list','children_count','agent_type_text']);
     }
 
 
diff --git a/app/common/model/marketing/Agent.php b/app/common/model/marketing/Agent.php
index 5fe9c07..425f35f 100644
--- a/app/common/model/marketing/Agent.php
+++ b/app/common/model/marketing/Agent.php
@@ -25,15 +25,6 @@ class Agent extends BaseModel{
         return 'agent';
     }
 
-    /**
-     * Common: 获取器 —— 信息唯一键（上级一致）
-     * Author: wu-hui
-     * Time: 2024/01/24 18:15
-     * @return string
-     */
-    public function getOnlyKeyAttr():string{
-        return ($this->uid ?? '') . '_' . ($this->agent_type ?? '');
-    }
     /**
      * Common: 获取器 —— 获取配送商关联的商户
      * Author: wu-hui
diff --git a/app/common/repositories/marketing/AgentRepository.php b/app/common/repositories/marketing/AgentRepository.php
index b4083b1..c4b6daa 100644
--- a/app/common/repositories/marketing/AgentRepository.php
+++ b/app/common/repositories/marketing/AgentRepository.php
@@ -285,8 +285,6 @@ class AgentRepository extends BaseRepository{
                 ->select()
                 ->toArray();
         }
-        // 信息处理及返回
-        $childrenList = array_column($childrenList,null,'only_key');
 
         return [
             'info' => $info ?? [],