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

gx



查看合并请求 !1574

@@ -36,20 +36,11 @@ class EnterpriseProductLogic extends BaseLogic
      * @time   :2025/3/26 10:17
      */
     public function saveEnterpriseProduct(){
-        $saveData = [];
-        foreach ($this->param['data'] as $k => $v){
-            if($k < 1){
-                continue;
-            }
-            $saveData[] = [
-                'title'=>$v[0],
-                'image'=>$v[1],
-                'url'=>$v[2],
-                'project_id'=>$this->param['project_id'],
-                'keywords'=>$v[3],
-                'release_at'=>$v[4],
-            ];
+        try {
+            $this->model->saveEnterpriseProduct($this->param['project_id'],$this->param['data']);
+        }catch (\Exception $e){
+            $this->fail('保存失败，请联系管理员');
         }
-        return $this->model->insertAll($saveData);
+        return $this->success();
     }
 }

@@ -24,14 +24,26 @@ class EnterpriseProduct extends Base
 
     /**
      * @remark :保存数据
-     * @name   :saveProduct
+     * @name   :saveEnterpriseProduct
      * @author :lyh
      * @method :post
-     * @time   :2025/3/26 10:20
+     * @time   :2025/3/26 10:42
      */
-    public function saveProduct($project_id,$data){
-        foreach ($data as $k => $v){
-
+    public function saveEnterpriseProduct($project_id,$data){
+        $saveData = [];
+        foreach ($data as $val){
+            $info = $this->read(['title'=>$val[0],'project_id'=>$project_id],['id']);
+            if($info === false){
+                $saveData[] = [
+                    'title'=>$val[0],
+                    'image'=>$val[1],
+                    'url'=>$val[2],
+                    'project_id'=>$project_id,
+                    'keywords'=>$val[3],
+                    'release_at'=>$val[4],
+                ];
+            }
         }
+        return $this->insertAll($saveData);
     }
 }

@@ -208,7 +208,11 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::any('/save', [Aside\Project\KeywordPrefixController::class, 'save'])->name('admin.keyword_save');
             Route::any('/del', [Aside\Project\KeywordPrefixController::class, 'del'])->name('admin.keyword_del');
         });
-
+        //企业资料库
+        Route::prefix('enterprise_product')->group(function () {
+            Route::any('/saveEnterpriseProduct', [Aside\Project\EnterpriseProductController::class, 'saveEnterpriseProduct'])->name('admin.enterprise_product_saveEnterpriseProduct');
+        });
+        //小语种
         Route::prefix('language')->group(function () {
             Route::any('/', [Aside\Project\MinorLanguagesController::class, 'getMinorLanguageList'])->name('admin.getMinorLanguageList');
             Route::any('/getLanguages', [Aside\Project\MinorLanguagesController::class, 'getLanguages'])->name('admin.getLanguages');