问卷:添加等级限制
This commit is contained in:
@@ -205,7 +205,7 @@ async function getModuleData(type: string, data: { role: RoleType, session: Fron
|
|||||||
case 'chapter':
|
case 'chapter':
|
||||||
return getMainChapter(role);
|
return getMainChapter(role);
|
||||||
case 'survey':
|
case 'survey':
|
||||||
return await getSurvey(role.roleId);
|
return await getSurvey(role.roleId, role.lv);
|
||||||
default:
|
default:
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -340,8 +340,8 @@ export async function getParamStr(activity: ActivityModelType, productID: string
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export async function getSurvey(roleId: string) {
|
export async function getSurvey(roleId: string, lv: number) {
|
||||||
let surveys = await SurveyModel.findEnableSurvey(SURVEY_SELECT.FIND);
|
let surveys = await SurveyModel.findEnableSurvey(lv, SURVEY_SELECT.FIND);
|
||||||
let recs = await SurveyRecModel.findByRole(roleId);
|
let recs = await SurveyRecModel.findByRole(roleId);
|
||||||
return surveys.filter(survey => {
|
return surveys.filter(survey => {
|
||||||
let index = recs.findIndex(rec => rec.surveyId == survey.surveyId);
|
let index = recs.findIndex(rec => rec.surveyId == survey.surveyId);
|
||||||
|
|||||||
@@ -42,8 +42,8 @@ export default class Survey extends BaseModel {
|
|||||||
@prop({ required: true })
|
@prop({ required: true })
|
||||||
isEnable: boolean; // 是否显示
|
isEnable: boolean; // 是否显示
|
||||||
|
|
||||||
public static async findEnableSurvey(select = '') {
|
public static async findEnableSurvey(lv: number, select = '') {
|
||||||
let rec: SurveyType[] = await SurveyModel.find({ isEnable: true, endTime: { $gte: nowSeconds() } }).select(select).lean();
|
let rec: SurveyType[] = await SurveyModel.find({ isEnable: true, lv: { $lte: lv }, startTime: { $lte: nowSeconds() }, endTime: { $gte: nowSeconds() } }).select(select).lean();
|
||||||
return rec;
|
return rec;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user