From 26079aa3c34f47e952a9538a93d6f8a3bab9a0fc Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 23 八月 2024 09:12:44 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0 --- UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ProblemController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ProblemController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ProblemController.java index 3953ab2..0018ab9 100644 --- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ProblemController.java +++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ProblemController.java @@ -76,13 +76,13 @@ @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<List<ProblemWarpper>> queryProblems(Integer pageNum, Integer size, HttpServletRequest request){ + public ResultUtil<List<ProblemWarpper>> queryProblems(Integer pageNum, Integer size, Integer language, HttpServletRequest request){ try { Integer uid = userInfoService.getUserIdFormRedis(request); if(null == uid){ return ResultUtil.tokenErr(); } - List<Map<String, Object>> maps = problemService.queryProblems(pageNum, size, uid); + List<Map<String, Object>> maps = problemService.queryProblems(pageNum, size, uid, language); return ResultUtil.success(ProblemWarpper.getProblemWarpper(maps)); }catch (Exception e){ e.printStackTrace(); -- Gitblit v1.7.1