筛选问题

app/Http/Controllers/Filter/SkuListFilter.php

@@ -30,12 +30,9 @@ class SkuListFilter
             $map['create_time/range'] = $startTime . ',' . $endTime;
             unset($map['create_time']);
         }
-
-        if (!checkPerm('ViewAllSku')) {
-            $map['encoded/condition'] = request()->user->codeId;
-        }
         $userId = request()->user->userId;
-        if (checkPerm('ViewSubordinateSku')) {
+        if (checkPerm('ViewAllSku')) {
+        } else if (checkPerm('ViewSubordinateSku')) {
             //查看下级
             $departmentService = new DepartmentService();
             //下属用户id(结果包括自己的id)
@@ -44,6 +41,8 @@ class SkuListFilter
             $subordinateCodeIds = $adminUserService->getCodeIdsByUserIds($subordinateUserIds);
             $subordinateCodeIds = $subordinateCodeIds->toArray();
             $map['encoded/eqs'] = implode(',', $subordinateCodeIds);
+        } else {
+            $map['encoded/condition'] = request()->user->codeId;
         }
         if ((!empty($map['update_time']))) {
             $times = explode('~', $map['update_time']);
@@ -53,6 +52,7 @@ class SkuListFilter
             unset($map['update_time']);
         }
 
+
         if (!empty($map['source_type'])) {
             switch ($map['source_type']) {
                 case 'all':