From 5a57b1b73022877150bb7a5fba58d1a636874dfa Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 15:01:31 +0800
Subject: [PATCH] 1020更新
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
index 5c3653a..b580b79 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -86,13 +87,15 @@
}
query.setIds(integers);
- List<SubjectVO> list = subjectService.listAll(query,type);
+ List<SubjectVO> list = subjectService.listAll(query,type,res);
+ Map<Integer, String> categoryMap = categoryService.list(null).stream()
+ .collect(Collectors.toMap(TCategory::getId, TCategory::getName));
for (SubjectVO subjectVO : list) {
if (subjectVO.getFirstCategory()!=null&&subjectVO.getSecondCategory()!=null){
- TCategory byId1 = categoryService.getById(subjectVO.getFirstCategory());
- TCategory byId2 = categoryService.getById(subjectVO.getSecondCategory());
+ String byId1 = categoryMap.get(subjectVO.getFirstCategory());
+ String byId2 = categoryMap.get(subjectVO.getSecondCategory());
if (byId1!=null&& byId2!=null){
- subjectVO.setCategoryName(byId1.getName()+"-"+byId2.getName());
+ subjectVO.setCategoryName(byId1+"-"+byId2);
}
}
// StringBuilder stringBuilder = new StringBuilder("");
@@ -120,7 +123,6 @@
subjectVO.setType(subjectVO.getType());
}
res.setRecords(list);
- res.setTotal(list.size());
return R.ok(res);
}
@PostMapping("/add")
--
Gitblit v1.7.1