From 7a317be175118947559af900ca063f116c5965a7 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 17 Mar 2023 17:24:25 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E5=90=8E=E5=8F=B0):=20?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=BB=84=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gm-server/app/service/Activity.ts    | 9 ++++++---
 shared/domain/gvgField/returnData.ts | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gm-server/app/service/Activity.ts b/gm-server/app/service/Activity.ts
index a7ef70345..8e2c8de5a 100644
--- a/gm-server/app/service/Activity.ts
+++ b/gm-server/app/service/Activity.ts
@@ -203,7 +203,7 @@ export default class Activity extends Service {
         // let checkTimeResult = await checkActivityEditable(activities);
         // if(!checkTimeResult) return resResult(STATUS.GM_CAN_NOT_EDIT_ACT);
         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);
         }
 
@@ -249,12 +249,15 @@ export default class Activity extends Service {
         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);
         if(!activityGroup) return false;
         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
diff --git a/shared/domain/gvgField/returnData.ts b/shared/domain/gvgField/returnData.ts
index 0946583d4..6ed7b7337 100644
--- a/shared/domain/gvgField/returnData.ts
+++ b/shared/domain/gvgField/returnData.ts
@@ -14,7 +14,7 @@ import { RoleRankInfo } from "../rank";
 import { GVGCityType } from "../../db/GVGCity";
 import { GVGTeamMem } from "../battleField/gvgBattle";
 import { GVGTeamType } from "../../db/GVGTeam";
-import GVGRoleData, { GVGRoleDataType } from "../../db/GVGRoleData";
+import { GVGRoleDataType } from "../../db/GVGRoleData";
 
 class LeagueLeaderInfo {
     name: string;        // 盟主名