Merge branch 'koogua/v1.4.5'

app/Caches/ImActiveGroupList.php

@@ -33,9 +33,7 @@ class ImActiveGroupList extends Cache
     {
         $groups = $this->findGroups();
 
-        if (empty($groups)) {
+        if (empty($groups)) return [];
-            return [];
-        }
 
         $result = [];
 
@@ -72,7 +70,6 @@ class ImActiveGroupList extends Cache
             ->orderBy('total_count DESC')
             ->where('receiver_type = :type:', ['type' => ImMessageModel::TYPE_GROUP])
             ->betweenWhere('create_time', $startTime, $endTime)
-            ->andWhere('published = 1')
             ->andWhere('deleted = 0')
             ->limit($limit)
             ->execute();

app/Caches/ImActiveUserList.php

@@ -32,9 +32,7 @@ class ImActiveUserList extends Cache
     {
         $users = $this->findUsers($id);
 
-        if (empty($users)) {
+        if (empty($users)) return [];
-            return [];
-        }
 
         $result = [];
 

app/Caches/ImGroupActiveUserList.php

@@ -32,9 +32,7 @@ class ImGroupActiveUserList extends Cache
     {
         $users = $this->findUsers($id);
 
-        if (empty($users)) {
+        if (empty($users)) return [];
-            return [];
-        }
 
         $result = [];