产品导入修改

app/Distributor/Repositories/DistProduct.php

@@ -75,7 +75,12 @@ class DistProduct extends EloquentRepository
      * 查询已导入的相册IDS
      */
     public static function getImportAlbumIds() {
-        return Model::where('dist_id', getDistributorId())->where('album_id', '!=', '')->distinct('album_id')->pluck('album_id');
+        $albumIds = Model::where('dist_id', getDistributorId())->where('album_id', '!=', '')->distinct('album_id')->pluck('album_id');
+        if ($albumIds->count() > 0) {
+            return $albumIds->toArray();
+        } else {
+            return [];
+        }
     }
 
 }

app/Distributor/Repositories/RpcAlbum.php

@@ -71,7 +71,7 @@ class RpcAlbum extends EloquentRepository
         $folder_id = $model->filter()->input('folder_id', '');
         $title = $model->filter()->input('title', '');
         $title_en = $model->filter()->input('title_en', '');
-        $imported = $model->filter()->input('imported', '0');
+        $imported = $model->filter()->input('imported', '');
 
         $filter = [
             'model' => $filterModel,
@@ -85,9 +85,16 @@ class RpcAlbum extends EloquentRepository
             $filter['title_en'] = $title_en;
         }
 
-        if ($imported == 1) {
+        if ($imported === "1") {
             $ids = DistProduct::getImportAlbumIds();
-            $filter['not_in_ids'] = implode(',', $ids);
+            if ($ids) {
+                $filter['in_ids'] = implode(',', $ids);
+            }
+        } else if ($imported === "0") {
+            $ids = DistProduct::getImportAlbumIds();
+            if ($ids) {
+                $filter['not_in_ids'] = implode(',', $ids);
+            }
         }
 
         $result = $this->execute('siteAlbumPaginate', [