Compare commits
No commits in common. "b30104051ed8c9acc4890ef296564958a864e140" and "84b567688d000e9c5b4e9b6a9a8279f0d00c882e" have entirely different histories.
b30104051e
...
84b567688d
|
@ -114,9 +114,6 @@ 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);
|
||||
|
@ -135,4 +132,4 @@ class SuYuanController extends BaseAdminController
|
|||
$save_name = Filesystem::disk('public')->putFile( '', $file);
|
||||
return $this->success('上传成功',['image'=>$this->request->domain().$save_name]);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue