From feb637afbcd96a1e58d4ab2a3abb1dc6694db039 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Thu, 5 May 2022 13:15:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E5=BE=81=EF=BC=9A=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/auctionService.ts      |  1 +
 shared/pubUtils/dictionary/DicSystemOpenTime.ts | 11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/game-server/app/services/auctionService.ts b/game-server/app/services/auctionService.ts
index 046e2db5c..17d324701 100644
--- a/game-server/app/services/auctionService.ts
+++ b/game-server/app/services/auctionService.ts
@@ -268,6 +268,7 @@ export async function calculateDividend(dividend: DividendType) {
         return {
             roleId,
             posNum, // 职位分红
+            hasJoin: true,
             weekendNum, // 额外分红，周末
             total: posNum + weekendNum, // 总分红
             status: 0, // 0：未领取，1：已领取
diff --git a/shared/pubUtils/dictionary/DicSystemOpenTime.ts b/shared/pubUtils/dictionary/DicSystemOpenTime.ts
index 80c30aa51..285e4d4f3 100644
--- a/shared/pubUtils/dictionary/DicSystemOpenTime.ts
+++ b/shared/pubUtils/dictionary/DicSystemOpenTime.ts
@@ -23,13 +23,10 @@ export function loadSystemOpenTime() {
     let arr = readFileAndParse(FILENAME.DIC_SYSTEM_OPEN_TIME);
 
     arr.forEach(o => {
-        if(o.isPlayer) {
-            o.seid = parseNumberList(o.seid);
-            let { warId, lv } = parseLimit(o.limit);
-            o.warId = warId;
-            o.lv = lv;
-            dicSystemOpenTime.set(o.jobid, _.pick(o, Object.keys(DicSystemOpenTimeKeys)));
-        }
+        let { warId, lv } = parseLimit(o.limit);
+        o.warId = warId;
+        o.lv = lv;
+        dicSystemOpenTime.set(o.id, _.pick(o, Object.keys(DicSystemOpenTimeKeys)));
     });
     arr = undefined;
 }