From a79996fedf6be3af3292495d394e0f0250b71d4c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 六月 2024 17:50:41 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index 224def4..e5bbfb6 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -97,15 +97,12 @@
wrapper.like("type", query.getType());
}
wrapper.eq("state", 1);
+ List<TStory> tStories = new ArrayList<>();
+
switch (query.getStoryType()) {
case 2:
List<TStory> list = storyService.list(wrapper);
- List<TStory> tSubjects = new ArrayList<>();
- for (TStory tSubject : list) {
- if (!tSubject.getError().isEmpty()) {
- tSubjects.add(tSubject);
- }
- }
+ List<TStory> tSubjects = new ArrayList<>(list);
res.setRecords(tSubjects);
res.setTotal(tSubjects.size());
return R.ok(res);
@@ -113,8 +110,13 @@
// 查询出error字段不为空的数据
wrapper.isNotNull("error");
List<TStory> list1 = storyService.list(wrapper);
- res.setRecords(list1);
- res.setTotal(list1.size());
+ for (TStory tStory : list1) {
+ if (tStory.getError()!=null && (!tStory.equals(""))){
+ tStories.add(tStory);
+ }
+ }
+ res.setRecords(tStories);
+ res.setTotal(tStories.size());
return R.ok(res);
}
--
Gitblit v1.7.1