diff --git a/app/enterprise/controller/Emoji.php b/app/enterprise/controller/Emoji.php index df24bae..763014f 100644 --- a/app/enterprise/controller/Emoji.php +++ b/app/enterprise/controller/Emoji.php @@ -12,8 +12,9 @@ class Emoji extends BaseController // 表情列表 public function index() { - $map=['status'=>1,'user_id'=>$this->uid,'type'=>2]; - $list = EmojiModel::where($map)->field('id,name,src,file_id')->order('update_time desc')->select(); + $map=['e.status'=>1,'e.user_id'=>$this->uid,'e.type'=>2]; + $prefix = config('database.connections.mysql.prefix'); + $list = EmojiModel::alias('e')->join($prefix.'file f','e.file_id = f.file_id')->where($map)->field('e.id,e.name,e.src,e.file_id')->order('e.update_time desc')->select(); $data=[]; if($list){ $data=$list->toArray();