diff --git a/application/adminapi/controller/RoomEmoji.php b/application/adminapi/controller/RoomEmoji.php index d548b47..5d54dc6 100644 --- a/application/adminapi/controller/RoomEmoji.php +++ b/application/adminapi/controller/RoomEmoji.php @@ -19,7 +19,7 @@ class RoomEmoji extends adminApi { protected $noNeedLogin = []; - protected $noNeedRight = ['room_user_log','room_flow']; + protected $noNeedRight = ['emoji_list','add_emoji','edit_emoji','del_emoji','emoji_detail','emoji_type_list']; protected $table = 'vs_room_emoji'; protected $table_type = 'vs_room_emoji_type'; @@ -50,10 +50,12 @@ class RoomEmoji extends adminApi ->count(); $list = Db::name($this->table) ->where($where) + ->where(['deletetime' => 0]) ->order('sort desc,id desc') ->page($page, $limit) ->select(); foreach ($list as &$item) { + $item['type_str'] = Db::name($this->table_type)->where('id', $item['type_id'])->value('type_name'); $item['createtime'] = date('Y-m-d H:i:s', $item['createtime']); $item['status_str'] = $item['status'] == 1 ? '显示' : '隐藏'; }