From b448d77d051c6b109ce676772eecb3c1bccbf87f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Tue, 30 Sep 2025 21:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/Withdrawal.php | 1 +
 application/api/controller/Guild.php           | 1 -
 application/api/model/Guild.php                | 9 ++++-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/application/adminapi/controller/Withdrawal.php b/application/adminapi/controller/Withdrawal.php
index 31ebd05..15c707f 100644
--- a/application/adminapi/controller/Withdrawal.php
+++ b/application/adminapi/controller/Withdrawal.php
@@ -75,6 +75,7 @@ class Withdrawal extends adminApi
             ->field('a.*,b.nickname,b.user_code')
             ->order('a.createtime desc')
             ->where($where)
+            ->page($page, $page_limit)
             ->select();
         $data_lists = [];
         foreach ($lists as $key => $value) {
diff --git a/application/api/controller/Guild.php b/application/api/controller/Guild.php
index 3f0a2a5..6c9ea91 100644
--- a/application/api/controller/Guild.php
+++ b/application/api/controller/Guild.php
@@ -22,7 +22,6 @@ class Guild extends BaseCom
     public function guild_list()
     {
         $page = input('page',1);
-        $page = $page > 0 ? $page : 1;
         $limit = input('limit',10);
         $search = input('search_id','');
         $reslut = model('Guild')->get_guild_list($page,$limit,$search,$this->uid);
diff --git a/application/api/model/Guild.php b/application/api/model/Guild.php
index b16cb7f..3b38e81 100644
--- a/application/api/model/Guild.php
+++ b/application/api/model/Guild.php
@@ -17,9 +17,9 @@ class Guild extends Model
      * @param $page
      * @param $limit
      */
-    public function get_guild_list($page,$limit=10,$search='',$user_id=0)
+    public function get_guild_list($page,$page_limit,$search='',$user_id=0)
     {
-        $where ="1=1";
+        $where =[];
         if ($search) {
            $where  = ['guild_special_id'=>['like',$search.'%']]; //通过工会ID搜索
         }
@@ -28,8 +28,7 @@ class Guild extends Model
             ->field('id,guild_special_id,user_id,guild_name,cover,num,intro,createtime,income')
             ->where(['is_show'=>1,'delete_time'=>0])
             ->where($where)
-            ->order('income desc')
-            ->page($page,$limit)
+            ->page($page, $page_limit)
             ->select();
         $count = Db::name('vs_guild')
             ->where(['is_show'=>1,'delete_time'=>0])
@@ -62,7 +61,7 @@ class Guild extends Model
         }
         $data =[
             'page'      => $page,
-            'limit'     => $limit,
+            'limit'     => $page_limit,
             'count'     => $count,
             'list'      => $list
         ];