Compare commits

...

2 Commits

Author SHA1 Message Date
weiz b30104051e Merge pull request 'fixed' (#2) from dev into master
Reviewed-on: #2
2023-10-14 17:00:11 +08:00
unknown 504587ebaa fixed 2023-10-14 16:57:36 +08:00
1 changed files with 4 additions and 1 deletions

View File

@ -114,6 +114,9 @@ class SuYuanController extends BaseAdminController
return $this->fail('参数错误');
}
$data = Db::name('environmental_data')->where('id',$params['id'])->where('flag',$params['flag'])->order('id desc')->findOrEmpty();
if($data->isEmpty()){
return $this->success('请求成功',[]);
}
$content = Db::name('production_base')->where('id',$data['production_base_id'])->field('content')->findOrEmpty();
$data['content'] = $content['content'];
return $this->success('请求成功',$data);
@ -132,4 +135,4 @@ class SuYuanController extends BaseAdminController
$save_name = Filesystem::disk('public')->putFile( '', $file);
return $this->success('上传成功',['image'=>$this->request->domain().$save_name]);
}
}
}