From 624c9eec90d59297800f03276f8518daa1bd9f94 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 09:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
index 0ee00b1..6a1dedd 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
@@ -25,12 +25,12 @@
@PostMapping("/base/honor/stuHonors")
public List<StuMedalVo> getStuHonors(@RequestBody List<Integer> honorIds){
List<StuMedalVo> stuMedalVos = new ArrayList<>();
- List<HonorRules> honorRules = hrService.list(new QueryWrapper<HonorRules>()
- .in("id", honorIds));
+ List<HonorRules> honorRules = hrService.querylistOfIds(honorIds);
if (honorRules.size() > 0){
honorRules.forEach(hrs -> {
StuMedalVo stuMedalVo = new StuMedalVo();
stuMedalVo.setLevelNum(Integer.getInteger(hrs.getLevel()));
+ stuMedalVo.setMedalType(hrs.getType());
switch (hrs.getType()){
case 1:
stuMedalVo.setMedalName("俱乐部之星");
@@ -48,6 +48,7 @@
break;
}
if (!Objects.equals(hrs.getLevel(), "10")){
+ stuMedalVo.setLevelNum(Integer.parseInt(hrs.getLevel()));
stuMedalVo.setNextLevel(Integer.parseInt(hrs.getLevel())+1);
stuMedalVo.setUpgradeConditions(hrs.getCondition());
stuMedalVo.setIsTopLevel(2);
--
Gitblit v1.7.1