From ed1e5d163555c57f0f65f6a489e0bba9be01fb38 Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 10 Sep 2021 17:43:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=9B=E5=9B=A2=EF=BC=9A=E9=99=90=E5=88=B6?= =?UTF-8?q?=E9=87=8D=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/guild/handler/guildHandler.ts | 7 +++++++ shared/db/Guild.ts | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/game-server/app/servers/guild/handler/guildHandler.ts b/game-server/app/servers/guild/handler/guildHandler.ts index 0da770b5e..40a353504 100644 --- a/game-server/app/servers/guild/handler/guildHandler.ts +++ b/game-server/app/servers/guild/handler/guildHandler.ts @@ -121,9 +121,16 @@ export class GuildHandler { const roleId = session.get('roleId'); const roleName = session.get('roleName'); + const serverId = session.get('serverId'); const { code, name, notice, introduce, ceLimit, isAuto, icon } = msg; if (!code) return resResult(STATUS.WRONG_PARMS); + // 检查名字是否重 + if(name != undefined) { + const checkNameResult = await GuildModel.checkName(name, serverId); + if (checkNameResult) return resResult(STATUS.GUILD_NAME_DUP); + } + const select = ['code', 'name', 'notice', 'introduce', 'ceLimit', 'isAuto', 'icon']; let updateInfo: GuildUpdateParam = {}; if(name != undefined) updateInfo.name = name; diff --git a/shared/db/Guild.ts b/shared/db/Guild.ts index 240ddf6d9..7caad6171 100644 --- a/shared/db/Guild.ts +++ b/shared/db/Guild.ts @@ -116,8 +116,8 @@ export default class Guild extends BaseModel { } public static async checkName(name: string, serverId: number) { - const result: GuildType = await GuildModel.findOne({ name, status: GUILD_STATUS.RUNNING, serverId }).lean(); - return !!result; + const result = await GuildModel.exists({ name, status: GUILD_STATUS.RUNNING, serverId }); + return result; } public static async findByCondition(page: number, showPeopleMax: boolean, name: string, serverId: number) {