From 7a6695c7ed19dba5384eb7d2048366e0f637d76d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Wed, 31 Dec 2025 13:39:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=90=88=E5=B9=B6=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/Guild.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/application/adminapi/controller/Guild.php b/application/adminapi/controller/Guild.php
index 8dcb840a..212f1fca 100644
--- a/application/adminapi/controller/Guild.php
+++ b/application/adminapi/controller/Guild.php
@@ -606,26 +606,25 @@ class Guild extends adminApi
         $guild_id = input('guild_id', '');
         $merge_guild_id = input('merge_guild_id', '');
         //解散工会
-        $guild = model('Guild')->getOne(['id'=>$guild_id]);
+        $guild = model('Guild')->getOne(['guild_special_id'=>$guild_id]);
+        $merge_guild=model('Guild')->getOne(['guild_special_id'=>$merge_guild_id]);
         if(empty($guild)){
             return V(0,"该工会不存在");
         }
         if($guild['status'] == 2){
             return V(0,"该工会已解散");
         }
+        if(!$merge_guild_id){
+            return V(0,"参数错误");
+        }
+        if(empty($merge_guild)){
+            return V(0,"并入工会不存在");
+        }
+        $guild_id = $guild['id'];
+        $merge_guild_id = $merge_guild['id'];
         db::startTrans();
         try{
             $res = model('Guild')->edit(['id'=>$guild_id],['status'=>2,'delete_time'=>time()]);
-            //并入工会
-            if(!$merge_guild_id){
-                db::rollback();
-                return V(0,"参数错误");
-            }
-            $merge_guild = model('Guild')->getOne(['id'=>$merge_guild_id]);
-            if(empty($merge_guild)){
-                db::rollback();
-                return V(0,"并入工会不存在");
-            }
             $merge_guild_user = db('vs_guild_user')->where(['guild_id'=>$merge_guild_id,'quit_type'=>0])->select();
             foreach ($merge_guild_user as $key=>$value){
                 $res = db('vs_guild_user')->insert([
@@ -637,7 +636,7 @@ class Guild extends adminApi
                     'is_deacon'=>$value['is_deacon'],
                     'is_show_room'=>$value['is_show_room'],
                     'remarks'=>$value['remarks'],
-                    'apply_time'=>$value['apply_time'],
+                    'apply_time'=>time(),
                     'createtime'=>time(),
                 ]);
                 if(!$res){