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

变更数据



查看合并请求 !3328

@@ -765,10 +765,10 @@ class ImageController extends Controller
         if($info === false){
         if($info === false){
             $this->response('请先设置水印',Code::SYSTEM_ERROR);
             $this->response('请先设置水印',Code::SYSTEM_ERROR);
         }
         }
-        if($info['status'] == 1 && empty($info['image_data'])){
+        if($this->param['status'] == 1 && empty($info['image_data'])){
             $this->response('请先设置水印',Code::SYSTEM_ERROR);
             $this->response('请先设置水印',Code::SYSTEM_ERROR);
         }
         }
-        if($info['status'] == 2 && empty($info['str_data'])){
+        if($this->param['status'] == 2 && empty($info['str_data'])){
             $this->response('请先设置文字水印',Code::SYSTEM_ERROR);
             $this->response('请先设置文字水印',Code::SYSTEM_ERROR);
         }
         }
         $imageSetting->edit(['status'=>$this->param['status']],['project_id'=>$this->cache['project_id']]);
         $imageSetting->edit(['status'=>$this->param['status']],['project_id'=>$this->cache['project_id']]);