From 661a691e983941ee656bf6ef6fed34a34bc4ff9e Mon Sep 17 00:00:00 2001 From: luying Date: Wed, 13 Apr 2022 15:04:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=EF=BC=9A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/connectorService.ts | 2 +- game-server/app/services/gmService.ts | 4 ++-- shared/db/Survery.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/game-server/app/services/connectorService.ts b/game-server/app/services/connectorService.ts index 0141034e8..18f119180 100644 --- a/game-server/app/services/connectorService.ts +++ b/game-server/app/services/connectorService.ts @@ -205,7 +205,7 @@ async function getModuleData(type: string, data: { role: RoleType, session: Fron case 'chapter': return getMainChapter(role); case 'survey': - return await getSurvey(role.roleId); + return await getSurvey(role.roleId, role.lv); default: return null; } diff --git a/game-server/app/services/gmService.ts b/game-server/app/services/gmService.ts index a8f0a5365..ceb0a6765 100644 --- a/game-server/app/services/gmService.ts +++ b/game-server/app/services/gmService.ts @@ -340,8 +340,8 @@ export async function getParamStr(activity: ActivityModelType, productID: string } -export async function getSurvey(roleId: string) { - let surveys = await SurveyModel.findEnableSurvey(SURVEY_SELECT.FIND); +export async function getSurvey(roleId: string, lv: number) { + let surveys = await SurveyModel.findEnableSurvey(lv, SURVEY_SELECT.FIND); let recs = await SurveyRecModel.findByRole(roleId); return surveys.filter(survey => { let index = recs.findIndex(rec => rec.surveyId == survey.surveyId); diff --git a/shared/db/Survery.ts b/shared/db/Survery.ts index 272b8afaf..d82329105 100644 --- a/shared/db/Survery.ts +++ b/shared/db/Survery.ts @@ -42,8 +42,8 @@ export default class Survey extends BaseModel { @prop({ required: true }) isEnable: boolean; // 是否显示 - public static async findEnableSurvey(select = '') { - let rec: SurveyType[] = await SurveyModel.find({ isEnable: true, endTime: { $gte: nowSeconds() } }).select(select).lean(); + public static async findEnableSurvey(lv: number, select = '') { + let rec: SurveyType[] = await SurveyModel.find({ isEnable: true, lv: { $lte: lv }, startTime: { $lte: nowSeconds() }, endTime: { $gte: nowSeconds() } }).select(select).lean(); return rec; }