合并分支 'master-server' 到 'master'

gx脚本导出产品



查看合并请求 !1142

@@ -100,17 +100,17 @@ class DownloadProject extends Command
      * @time   :2023/9/14 13:56
      * @time   :2023/9/14 13:56
      */
      */
     public function getCategoryList(){
     public function getCategoryList(){
-        $data = Common::get_user_cache('product_category',$this->user['project_id']);
+        $data = Common::get_user_cache('product_category',1225);
         if(empty($data)){
         if(empty($data)){
             $categoryModel = new Category();
             $categoryModel = new Category();
             $data = [];
             $data = [];
-            $cateList = $categoryModel->list(['project_id'=>$this->user['project_id']],['id','title']);
+            $cateList = $categoryModel->list(['project_id'=>1225],['id','title']);
             if(!empty($cateList)){
             if(!empty($cateList)){
                 foreach ($cateList as $value){
                 foreach ($cateList as $value){
                     $data[$value['id']] = $value['title'];
                     $data[$value['id']] = $value['title'];
                 }
                 }
             }
             }
-            Common::set_user_cache($data,'product_category',$this->user['project_id']);
+            Common::set_user_cache($data,'product_category',1225);
         }
         }
         return $data;
         return $data;
     }
     }