diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index d382804f0..5e38dc49a 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -1834,7 +1834,7 @@ class UsersController extends AbstractController $lists[] = [ 'type' => 'children', 'url' => Base::fillUrl("api/users/share/list") . "?pid=" . $file['id'], - 'icon' => url("/images/file/light/folder.svg"), + 'icon' => $file['share'] == 1 ? url("/images/file/light/folder-share.png") : url("/images/file/light/folder.png"), 'extend' => ['upload_file_id'=>$file['id']], 'name' => $file['name'], ]; @@ -1845,7 +1845,7 @@ class UsersController extends AbstractController $lists[] = [ 'type' => 'children', 'url' => Base::fillUrl("api/users/share/list")."?pid=0", - 'icon' => url("/images/file/light/folder.svg"), + 'icon' => url("/images/file/light/folder.png"), 'extend' => ['upload_file_id'=>0], 'name' => '全部文件', ]; diff --git a/app/Models/File.php b/app/Models/File.php index 0911b0524..e25b5032c 100644 --- a/app/Models/File.php +++ b/app/Models/File.php @@ -107,7 +107,7 @@ class File extends AbstractModel $permission = 1000; $userids = $user->isTemp() ? [$user->userid] : [0, $user->userid]; $builder = File::wherePid($pid) - ->when($type== 'dir',function($q){ + ->when($type=='dir',function($q){ $q->whereType('folder'); }); if ($pid > 0) { @@ -161,7 +161,7 @@ class File extends AbstractModel ->whereIn('file_users.userid', $userids) ->groupBy('files.id') ->take(100) - ->when($type== 'dir',function($q){ + ->when($type=='dir',function($q){ $q->where('files.type','folder'); }) ->get();