恋仙传奇 搬移。

application/adminapi/controller/Guild.php

@@ -699,6 +699,11 @@ class Guild extends adminApi
                 //更新公会人数
                 db('vs_guild')->where('id', $merge_guild_id)->setInc('num');
                 //拉用户进入工会群聊
+                if($merge_guild_id<=95){
+                    $merge_guild_id = "g".$merge_guild_id;
+                }else{
+                    $merge_guild_id = $merge_guild_id;
+                }
                 $rid = 'g'.$merge_guild_id;
                 $reslut = model('api/Tencent')->add_group_member($rid, $value['user_id']);
             }
@@ -708,6 +713,11 @@ class Guild extends adminApi
                 return V(0,"失败");
             }
             //解散群
+            if($guild_id<=95){
+                $guild_id = "g".$guild_id;
+            }else{
+                $guild_id = $guild_id;
+            }
             model('api/Tencent')->delete_group('g'.$guild_id);
             db::commit();
             return V(1,"成功");