diff --git a/application/adminapi/controller/Guild.php b/application/adminapi/controller/Guild.php
index 62b280f3..e4d1eeb3 100644
--- a/application/adminapi/controller/Guild.php
+++ b/application/adminapi/controller/Guild.php
@@ -625,17 +625,16 @@ class Guild extends adminApi
         db::startTrans();
         try{
             $res = model('Guild')->edit(['id'=>$guild_id],['status'=>2,'delete_time'=>time()]);
-            $merge_guild_user = db('vs_guild_user')->where(['guild_id'=>$merge_guild_id,'quit_type'=>0])->select();
+            $merge_guild_user = db('vs_guild_user')->where(['guild_id'=>$guild_id,'quit_type'=>0,'status'=>1])->select();
             foreach ($merge_guild_user as $key=>$value){
                 $res = db('vs_guild_user')->insert([
                     'user_id'=>$value['user_id'],
                     'guild_id'=>$merge_guild_id,
                     'room_id'=>$value['room_id'],
-                    'coin'=>$value['coin'],
                     'status'=>$value['status'],
-                    'is_deacon'=>$value['is_deacon'],
                     'is_show_room'=>$value['is_show_room'],
-                    'remarks'=>$value['remarks'],
+                    'remarks'=>"公会合并：从".$guild['guild_name']."合入".$merge_guild['guild_name'],
+                    'settlement_ratio' =>$value['settlement_ratio'],
                     'apply_time'=>time(),
                     'createtime'=>time(),
                 ]);