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

gx异步执行更新列表页



查看合并请求 !1357

@@ -72,13 +72,15 @@ class WebSettingTextLogic extends BaseLogic
             ];
             ];
             $web_setting->edit($data,['project_id'=>$this->user['project_id']]);
             $web_setting->edit($data,['project_id'=>$this->user['project_id']]);
             $this->model->del(['project_id'=>$this->user['project_id']]);
             $this->model->del(['project_id'=>$this->user['project_id']]);
-            foreach ($this->param['data'] as $k => $v){
-                $v['created_at'] = date('Y-m-d H:i:s');
-                $v['updated_at'] = date('Y-m-d H:i:s');
-                $v['project_id'] = $this->user['project_id'];
-                $this->param['data'][$k] = $v;
+            if(!empty($this->param['data'])){
+                foreach ($this->param['data'] as $k => $v){
+                    $v['created_at'] = date('Y-m-d H:i:s');
+                    $v['updated_at'] = date('Y-m-d H:i:s');
+                    $v['project_id'] = $this->user['project_id'];
+                    $this->param['data'][$k] = $v;
+                }
+                $this->model->insert($this->param['data']);
             }
             }
-            $this->model->insert($this->param['data']);
             DB::commit();
             DB::commit();
         }catch (\Exception $e){
         }catch (\Exception $e){
             DB::rollBack();
             DB::rollBack();