From 22793d8ec3c48f8ef4ebc478d8dc66ed8a3a8616 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 21 Jul 2023 11:05:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E7=AB=A0=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/CompanyController.php | 4 ++--
 app/adminapi/logic/article/ArticleLogic.php   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php
index 9067fdd56..588e9f1ae 100644
--- a/app/adminapi/controller/CompanyController.php
+++ b/app/adminapi/controller/CompanyController.php
@@ -268,9 +268,9 @@ class CompanyController extends BaseAdminController
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function subordinate($id)
+    public function subordinate($company_id)
     {
-        $company = Company::findOrEmpty($id);
+        $company = Company::findOrEmpty($company_id);
         $result = loopGetChild(Company::class, $company->id, 'level_one');
         return $this->success('success', $result, 1, 1);
     }
diff --git a/app/adminapi/logic/article/ArticleLogic.php b/app/adminapi/logic/article/ArticleLogic.php
index 641ab0404..1e0e0d0db 100755
--- a/app/adminapi/logic/article/ArticleLogic.php
+++ b/app/adminapi/logic/article/ArticleLogic.php
@@ -45,6 +45,8 @@ class ArticleLogic extends BaseLogic
             'cid' => $params['cid'],
             'is_show' => $params['is_show'],
             'content' => $params['content'] ?? '',
+            'admin_id' => request()->adminInfo['id'] ?? 0,
+            'company_id' => request()->adminInfo['company_id'] ?? 0,
         ]);
     }