From d1632e46b772d691e55b4013585bfe61164b8bde Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 10 一月 2025 18:30:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java b/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java index 89f6c70..99bc8b5 100644 --- a/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java +++ b/manage/src/main/java/com/jilongda/manage/controller/TLineUpController.java @@ -39,10 +39,14 @@ PageInfo<TLineUp> res = lineUpService.pageList(query); return ApiResult.success(res); } - @ApiOperation(value = "查询当前排队人数",tags = "排号a管理") + @ApiOperation(value = "查询当前排队人数",tags = "排号管理") @GetMapping(value = "/getCount") - public ApiResult getCount(@RequestParam Integer storeId) { - return ApiResult.success(lineUpService.lambdaQuery().eq(TLineUp::getStoreId,storeId).eq(TLineUp::getStatus,1).list().size()); + public ApiResult getCount( Integer storeId) { + if (storeId!=null){ + return ApiResult.success(lineUpService.lambdaQuery().eq(TLineUp::getStoreId,storeId).eq(TLineUp::getStatus,1).list().size()); + }else{ + return ApiResult.success(lineUpService.lambdaQuery().eq(TLineUp::getStatus,1).list().size()); + } } @ApiOperation(value = "取消排队",tags = "排号管理") @GetMapping(value = "/cancel") -- Gitblit v1.7.1