diff --git a/app/adminapi/lists/article/ArticleLists.php b/app/adminapi/lists/article/ArticleLists.php index 1fe95c690..56d8b2ba2 100755 --- a/app/adminapi/lists/article/ArticleLists.php +++ b/app/adminapi/lists/article/ArticleLists.php @@ -73,12 +73,9 @@ class ArticleLists extends BaseAdminDataLists implements ListsSearchInterface, L */ public function lists(): array { - $query = Article::where($this->searchWhere); + $query = Article::where($this->searchWhere); if($this->adminInfo['root']!=1){ - $companyIds = CompanyLogic::getAllCompanyIds(); - if (!empty($companyIds)) { - $query->whereIn('company_id', $companyIds); - } + $query->where('company_id', $this->adminInfo['company_id']); } $ArticleLists = $query->with(['company']) @@ -99,7 +96,11 @@ class ArticleLists extends BaseAdminDataLists implements ListsSearchInterface, L */ public function count(): int { - return Article::where($this->searchWhere)->count(); + $query = Article::where($this->searchWhere); + if($this->adminInfo['root']!=1){ + $query->where('company_id', $this->adminInfo['company_id']); + } + return $query->count(); } public function extend()