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

gx



查看合并请求 !2573

@@ -41,13 +41,20 @@ class WebSettingImageController extends BaseController
     public function save(WebSettingImage $webSettingImage){
     public function save(WebSettingImage $webSettingImage){
         try {
         try {
             foreach ($this->param['data'] as $v){
             foreach ($this->param['data'] as $v){
+
                 if(isset($v['id']) && !empty($v['id'])){
                 if(isset($v['id']) && !empty($v['id'])){
                     $v['image'] = str_replace_url($v['image']);
                     $v['image'] = str_replace_url($v['image']);
                     $webSettingImage->edit($v,['id'=>$v['id']]);
                     $webSettingImage->edit($v,['id'=>$v['id']]);
                 }else{
                 }else{
-                    $v['project_id'] = $this->user['project_id'];
-                    $v['image'] = str_replace_url($v['image']);
-                    $webSettingImage->add($v);
+                    $info = $webSettingImage->read(['type'=>$v['type']],'id');
+                    if($info === false){
+                        $v['project_id'] = $this->user['project_id'];
+                        $v['image'] = str_replace_url($v['image']);
+                        $webSettingImage->add($v);
+                    }else{
+                        $v['image'] = str_replace_url($v['image']);
+                        $webSettingImage->edit($v,['id'=>$info['id']]);
+                    }
                 }
                 }
             }
             }
         }catch (\Exception $e){
         }catch (\Exception $e){