From 4fa201093aebfd5da77f22138c8d1c875d59305d Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 27 Sep 2019 15:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=8A=A0=E5=85=A5=E5=B7=A5=E4=BC=9A?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/family/GuildLogic.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index e7b4e6e2d..5eda5f27e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -242,6 +242,10 @@ public class GuildLogic { MessageUtil.sendErrorResponse(session,0,msgId,"公会不存在"); return; } + if(guildInfo.getJoinType()!=1){ + MessageUtil.sendErrorResponse(session,0,msgId,"该工会限制条件已修改"); + return; + } if(user.getPlayerInfoManager().getLevel() entry:applyGuild.entrySet()){ GuilidManager.removeOneApplyGuildInfos(entry.getValue().getGuildId(),entry.getValue().getId()); Map applyPersonal = GuilidManager.getApplyGuildInfos(entry.getValue().getId(), 1); @@ -435,6 +447,9 @@ public class GuildLogic { } break; case 3: //同意一个 + if(UserManager.getUser(applyId).getPlayerInfoManager().getGuildId()!=0){ + MessageUtil.sendErrorResponse(session,0,msgId,"该成员已经加入其他工会!"); + } if(guildInfo.getTotalMembers()>=SGuildLevelConfig.sGuildLevelConfigMap.get(guildInfo.getLevel()).getNum()){ MessageUtil.sendErrorResponse(session,0,msgId,"公会人数已满,无法加入"); return;