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

gx导入项目脚本



查看合并请求 !2128

@@ -23,7 +23,7 @@ class WebSettingImageController extends BaseController
      * @time   :2023/9/21 15:12
      * @time   :2023/9/21 15:12
      */
      */
     public function lists(WebSettingImage $webSettingImage){
     public function lists(WebSettingImage $webSettingImage){
-        $list = $webSettingImage->list($this->map,'id',['id','image','type']);
+        $list = $webSettingImage->list($this->map,'id',['id','image','type','is_call']);
         foreach ($list as $k=>$v){
         foreach ($list as $k=>$v){
             $v['image'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
             $v['image'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
             $list[$k] = $v;
             $list[$k] = $v;
@@ -40,11 +40,15 @@ class WebSettingImageController extends BaseController
      */
      */
     public function save(WebSettingImage $webSettingImage){
     public function save(WebSettingImage $webSettingImage){
         try {
         try {
-            $webSettingImage->del(['project_id'=>$this->user['project_id']]);
             foreach ($this->param['data'] as $v){
             foreach ($this->param['data'] as $v){
-                $v['project_id'] = $this->user['project_id'];
-                $v['image'] = str_replace_url($v['image']);
-                $webSettingImage->add($v);
+                if(isset($v['id']) && !empty($v['id'])){
+                    $v['image'] = str_replace_url($v['image']);
+                    $webSettingImage->edit($v,['id'=>$v['id']]);
+                }else{
+                    $v['project_id'] = $this->user['project_id'];
+                    $v['image'] = str_replace_url($v['image']);
+                    $webSettingImage->add($v);
+                }
             }
             }
         }catch (\Exception $e){
         }catch (\Exception $e){
             $this->response('系统错误请联系管理员');
             $this->response('系统错误请联系管理员');