diff --git a/app/Http/Home/Views/im/group/manage_users.volt b/app/Http/Home/Views/im/group/manage_users.volt
index 8da3b8a2..bdd1ddc6 100644
--- a/app/Http/Home/Views/im/group/manage_users.volt
+++ b/app/Http/Home/Views/im/group/manage_users.volt
@@ -37,7 +37,7 @@
{{ gender_info(item.user.gender) }} |
{{ date('Y-m-d H:i:s',item.create_time) }} |
- {% if item.user.id == group.owner.id %}
+ {% if item.user.id != group.owner.id %}
{% else %}
diff --git a/app/Http/Home/Views/user/console/courses.volt b/app/Http/Home/Views/user/console/courses.volt
index 8066eac5..04a2bbfb 100644
--- a/app/Http/Home/Views/user/console/courses.volt
+++ b/app/Http/Home/Views/user/console/courses.volt
@@ -63,4 +63,10 @@
+{% endblock %}
+
+{% block include_js %}
+
+ {{ js_include('home/js/user.console.js') }}
+
{% endblock %}
\ No newline at end of file
diff --git a/app/Repos/CourseFavorite.php b/app/Repos/CourseFavorite.php
index fadab1a6..cfa69092 100644
--- a/app/Repos/CourseFavorite.php
+++ b/app/Repos/CourseFavorite.php
@@ -30,6 +30,10 @@ class CourseFavorite extends Repository
$builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]);
}
+ if (isset($where['deleted'])) {
+ $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
+ }
+
switch ($sort) {
default:
$orderBy = 'id DESC';
diff --git a/app/Services/Logic/User/Console/FavoriteList.php b/app/Services/Logic/User/Console/FavoriteList.php
index 99dc16b0..3ba07d8e 100644
--- a/app/Services/Logic/User/Console/FavoriteList.php
+++ b/app/Services/Logic/User/Console/FavoriteList.php
@@ -31,6 +31,8 @@ class FavoriteList extends LogicService
$params['user_id'] = $user->id;
+ $params['deleted'] = 0;
+
$sort = $pagerQuery->getSort();
$page = $pagerQuery->getPage();
$limit = $pagerQuery->getLimit();
|