xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix(后台): 活动组类型查询逻辑修复

Browse Source
This commit is contained in:
luying
2023-03-17 17:24:25 +08:00
parent 3669d557a7
commit 7a317be175
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gm-server/app/service/Activity.ts
+6 -3
View File
@@ -203,7 +203,7 @@ export default class Activity extends Service {
// let checkTimeResult = await checkActivityEditable(activities); // let checkTimeResult = await checkActivityEditable(activities);
// if(!checkTimeResult) return resResult(STATUS.GM_CAN_NOT_EDIT_ACT); // if(!checkTimeResult) return resResult(STATUS.GM_CAN_NOT_EDIT_ACT);
if(data.groupId) { if(data.groupId) {
let checkGroup = await this.checkActivityGroupTypeWithId(data.groupId, activities); let checkGroup = await this.checkActivityGroupTypeWithId(data.groupId, data.type);
if(!checkGroup) return ctx.service.utils.resResult(STATUS.GM_ACTIVITY_NOT_FIT_GROUP_TYPE); if(!checkGroup) return ctx.service.utils.resResult(STATUS.GM_ACTIVITY_NOT_FIT_GROUP_TYPE);
} }
@@ -249,12 +249,15 @@ export default class Activity extends Service {
return ctx.service.utils.resResult(STATUS.SUCCESS); return ctx.service.utils.resResult(STATUS.SUCCESS);
} }
private async checkActivityGroupTypeWithId(groupId: number, activities: ActivityModelType[]) { private async checkActivityGroupTypeWithId(groupId: number, activityType: number) {
let activityGroup = await ActivityGroupModel.findGroupData(groupId); let activityGroup = await ActivityGroupModel.findGroupData(groupId);
if(!activityGroup) return false; if(!activityGroup) return false;
if(activityGroup.type != 0) { if(activityGroup.type != 0) {
return await this.checkActivityGroupType(activityGroup.type, activities); let activityGroupType = await ActivityGroupTypeModel.findByGroupType(activityGroup.type);
let dic = activityGroupType.activityTypes;
let index = dic.findIndex(cur => cur.activityType == activityType);
return index != -1;
} }
return true return true
shared/domain/gvgField/returnData.ts
+1 -1
View File
@@ -14,7 +14,7 @@ import { RoleRankInfo } from "../rank";
import { GVGCityType } from "../../db/GVGCity"; import { GVGCityType } from "../../db/GVGCity";
import { GVGTeamMem } from "../battleField/gvgBattle"; import { GVGTeamMem } from "../battleField/gvgBattle";
import { GVGTeamType } from "../../db/GVGTeam"; import { GVGTeamType } from "../../db/GVGTeam";
import GVGRoleData, { GVGRoleDataType } from "../../db/GVGRoleData"; import { GVGRoleDataType } from "../../db/GVGRoleData";
class LeagueLeaderInfo { class LeagueLeaderInfo {
name: string; // 盟主名 name: string; // 盟主名