军团：修复周活跃问题

game-server/app/services/guildTrainService.ts

@@ -165,7 +165,7 @@ export async function resetTrain(code: string, serverId: number) {
     if (!guild) {//不满足重置条件，结束并解锁
         return trainId;
     }
-    const userGuildList = await UserGuildModel.getListByGuild(code, 'trainRewards', {});
+    const userGuildList = await UserGuildModel.getListByGuild(code, 'trainRewards roleId', {});
     const guildTrains = await GuildTrainModel.getGuildTrainBoxs(code);
 
     //结算未领取的宝箱奖励发送到邮件中

game-server/app/services/rankService.ts

@@ -1173,7 +1173,7 @@ export async function getRankInHandler(redisKey: REDIS_KEY, type: RANK_TYPE, key
         } else if (type == RANK_TYPE.GUILD_LV) {
             if(role.hasGuild) {
                 let guild = await GuildModel.findByCode(guildCode, serverId);
-                myRank = await r.generMyRankWithGuild2(roleId, guild.lv, guild.lvUpdateTime, guild.activeWeekly, guild);
+                myRank = await r.generMyRankWithGuild2(roleId, guild.lv, guild.activeWeekly, guild.lvUpdateTime, guild);
             }
         } else if (type == RANK_TYPE.GUILD_FUND) {
             if(role.hasGuild) {

game-server/app/services/redisService.ts

@@ -110,7 +110,7 @@ export async function initSingleRank(key: string) {
     if(key == REDIS_KEY.PVP_RANK) {
         await setRankRedisFromDb(key, {});
     } else {
-        const serverList = await GameModel.getAllServerList();
+        const serverList = await ServerlistModel.findByEnv(pinus.app.get('env'));
         for(let { id } of serverList) {
             await setRankRedisFromDb(key, { serverId: id });
         }