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

Lyh server



查看合并请求 !3059

@@ -73,7 +73,7 @@ class GeoWritingsTask extends Command
                     'status'=>2,
                     'status'=>2,
                     'writings_id'=>$id,
                     'writings_id'=>$id,
                 ];
                 ];
-                $geoWritingsTaskModel->edit($data,['task_id'=>$task_id]);
+                $geoWritingsTaskModel->edit($data,['id'=>$task_id]);
             }catch (\Exception $e){
             }catch (\Exception $e){
                 echo date('Y-m-d H:i:s').'保存失败：'.$task_id.$e->getMessage().PHP_EOL;
                 echo date('Y-m-d H:i:s').'保存失败：'.$task_id.$e->getMessage().PHP_EOL;
                 continue;
                 continue;

@@ -54,6 +54,7 @@ class GeoWritingsLogic extends BaseLogic
                 $id = $this->param['id'];
                 $id = $this->param['id'];
                 $this->model->edit($this->param,['id'=>$id]);
                 $this->model->edit($this->param,['id'=>$id]);
             }else{
             }else{
+                $this->param['type'] = GeoWritings::TYPE_SUBMIT;
                 $this->param['uniqid'] = uniqid().$this->param['project_id'];
                 $this->param['uniqid'] = uniqid().$this->param['project_id'];
                 $id = $this->model->addReturnId($this->param);
                 $id = $this->model->addReturnId($this->param);
             }
             }