红点：修复练兵场

game-server/app/services/connectorService.ts

@@ -72,7 +72,6 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession
     let { role, session } = data;
     const { roleId, serverId, roleName, guildCode } = role;
     let { hasGuild, guild, userGuild, guildResult } = guildData;
-    console.log('*********', type)
     switch(type) {
         case 'shop': // 商店
             return await getAllShopList(roleId);
@@ -198,7 +197,7 @@ async function getPvpEntryData(roleId: string) {
 async function getGuildEntryData(role: RoleType, sid: string, session: FrontendOrBackendSession) {
 
     if (role.hasGuild) {
-        let userGuild = await getUserGuildWithRefActive(role.roleId, 'job auth guildCode receivedActive activeRecord activeDaily activeWeekly wishDntCnt wishGoods');
+        let userGuild = await getUserGuildWithRefActive(role.roleId);
         if (userGuild) {
             let guild = await getGuildWithRefActive(userGuild.guildCode, role.serverId);
             if (guild) {

game-server/app/services/guildService.ts

@@ -214,7 +214,7 @@ export async function addActive(roleId: string, serverId: number, id: number, ty
  * @param roleId 用户id
  * @param select 筛选字段
  */
-export async function getUserGuildWithRefActive(roleId: string, select: string, notPush?: boolean) {
+export async function getUserGuildWithRefActive(roleId: string, select?: string, notPush?: boolean) {
     let userGuild = await UserGuildModel.getMyGuild(roleId, select ? select + ' wishGoods +refTimeDaily' : '+refTimeDaily');
     // console.log(JSON.stringify(userGuild))
     if (!userGuild) return false;