From f10269874445dbd6ec8085321851255ad4956f41 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Thu, 27 May 2021 20:38:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=B2=A1=E6=9C=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/controllers/puzzle.controller.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/api/controllers/puzzle.controller.ts b/src/api/controllers/puzzle.controller.ts
index c62f82f..5e1985f 100644
--- a/src/api/controllers/puzzle.controller.ts
+++ b/src/api/controllers/puzzle.controller.ts
@@ -30,6 +30,7 @@ import {
 import { Shop, validShopId } from '../../models/shop/Shop'
 import { ShopActivity } from '../../models/shop/ShopActivity'
 import { GameUser } from '../../models/GameUser'
+import { isObjectId } from '../../utils/string.util'
 
 
 class PuzzleController extends BaseController {
@@ -337,6 +338,13 @@ class PuzzleController extends BaseController {
     let {shop, level, accountId, mode, skip, limit} = req.params
     skip = +skip || 0
     limit = +limit || 10
+    if (!isObjectId(shop)) {
+      let record = await Shop.fetchByID(shop)
+      if (!record) {
+        throw new ZError(12, 'shop not found')
+      }
+      shop = record.id
+    }
     let {rankList, userRank, rankTotal} = await getRank({shop, level, accountId, mode, skip, limit})
     return {rankList, userRank, rankTotal}
   }