diff --git a/app/adminapi/lists/finance/AccountLogLists.php b/app/adminapi/lists/finance/AccountLogLists.php
index 38b66008f..cf8455fbf 100755
--- a/app/adminapi/lists/finance/AccountLogLists.php
+++ b/app/adminapi/lists/finance/AccountLogLists.php
@@ -39,7 +39,7 @@ class AccountLogLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['al.change_type'],
+            '=' => ['change_type','company_id'],
         ];
     }
 
@@ -57,18 +57,13 @@ class AccountLogLists extends BaseAdminDataLists implements ListsSearchInterface
             $where[] = ['change_type', 'in', AccountLogEnum::getUserMoneyChangeType()];
         }
 
-        if (!empty($this->params['user_info'])) {
-            $where[] = ['u.sn|u.nickname|u.mobile', 'like', '%' . $this->params['user_info'] . '%'];
-        }
-
         if (!empty($this->params['start_time'])) {
-            $where[] = ['al.create_time', '>=', strtotime($this->params['start_time'])];
+            $where[] = ['create_time', '>=', strtotime($this->params['start_time'])];
         }
 
         if (!empty($this->params['end_time'])) {
-            $where[] = ['al.create_time', '<=', strtotime($this->params['end_time'])];
+            $where[] = ['create_time', '<=', strtotime($this->params['end_time'])];
         }
-
         return $where;
     }
 
@@ -108,9 +103,7 @@ class AccountLogLists extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function count(): int
     {
-        return UserAccountLog::alias('al')
-            ->join('user u', 'u.id = al.user_id')
-            ->where($this->queryWhere())
+        return UserAccountLog::where($this->queryWhere())
             ->where($this->searchWhere)
             ->count();
     }
diff --git a/app/api/logic/IndexLogic.php b/app/api/logic/IndexLogic.php
index a16f7c23a..d3794a4e4 100755
--- a/app/api/logic/IndexLogic.php
+++ b/app/api/logic/IndexLogic.php
@@ -114,7 +114,7 @@ class IndexLogic extends BaseLogic
         $group_find=UserRole::where('id',$group_id)->find();
         $menu=[];
         if($group_find){
-            $select=UserMenu::where('id','in',$group_find['menu_arr'])->field('id,pid,name,icon,sort,paths')->limit(100)->select()->toArray();
+            $select=UserMenu::where('id','in',$group_find['menu_arr'])->field('id,pid,name,icon,sort,paths')->order('sort','desc')->limit(100)->select()->toArray();
             $arr=[];
             foreach($select as $k=>$v){
                 if($v['pid']==0){