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, ]); }