场景获客优化子账号只能展示自己的数据

Server/application/cunkebao/controller/plan/GetPlanSceneListV1Controller.php

@@ -34,7 +34,6 @@ class GetPlanSceneListV1Controller extends BaseController
                 $where[] = ['scenarioTags', 'like', '%' . $params['tag'] . '%'];
             }
         
-            
             // 查询数据
             $query = PlansSceneModel::where($where);
             
@@ -193,10 +192,19 @@ class GetPlanSceneListV1Controller extends BaseController
             return [];
         }
 
+
+        $where = [
+            ['companyId', '=', $companyId],
+            ['deleteTime', '=', 0],
+            ['sceneId', 'in', $sceneIds],
+        ];
+        if(!$this->getUserInfo('isAdmin')){
+            $where[] = ['userId', '=', $this->getUserInfo('id')];
+        }
+
+
         $rows = Db::name('customer_acquisition_task')
-            ->whereIn('sceneId', $sceneIds)
+            ->where($where)
-            ->where('companyId', $companyId)
-            ->where('deleteTime', 0)
             ->field('sceneId, COUNT(*) as total')
             ->group('sceneId')
             ->select();

Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php

@@ -30,7 +30,7 @@ class PlanSceneV1Controller extends BaseController
                 'companyId' => $this->getUserInfo('companyId'),
             ];
     
-            if($this->getUserInfo('isAdmin')){
+            if(!$this->getUserInfo('isAdmin')){
                 $where['userId'] = $this->getUserInfo('id');
             }
 
@@ -176,7 +176,7 @@ class PlanSceneV1Controller extends BaseController
             }
 
             // 如果是管理员，需要验证用户权限
-            if ($this->getUserInfo('isAdmin')) {
+            if (!$this->getUserInfo('isAdmin')) {
                 $userPlan = Db::name('customer_acquisition_task')
                     ->where([
                         'id' => $planId,