From 72d4afb7b0f12753846ffb9baf0d593635df55a3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 18 六月 2024 15:47:55 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 f24d629..d15254a 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
@@ -99,8 +99,14 @@
switch (query.getStoryType()) {
case 2:
List<TStory> list = storyService.list(wrapper);
- res.setRecords(list);
- res.setTotal(list.size());
+ List<TStory> tSubjects = new ArrayList<>();
+ for (TStory tSubject : list) {
+ if (!tSubject.getError().isEmpty()) {
+ tSubjects.add(tSubject);
+ }
+ }
+ res.setRecords(tSubjects);
+ res.setTotal(tSubjects.size());
return R.ok(res);
case 1:
// 查询出error字段不为空的数据
@@ -157,9 +163,17 @@
res.setTotal(list2.size());
return R.ok(res);
case 4:
+ // 查询出error字段不为空的数据
+ wrapper.isNotNull("error");
List<TSubject> list3 = subjectService.list(wrapper);
- res.setRecords(list3);
- res.setTotal(list3.size());
+ List<TSubject> tSubjects3 = new ArrayList<>();
+ for (TSubject tSubject : list3) {
+ if (!tSubject.getError().isEmpty()) {
+ tSubjects3.add(tSubject);
+ }
+ }
+ res.setRecords(tSubjects3);
+ res.setTotal(tSubjects3.size());
return R.ok(res);
case 5:
List<TSubject> list4 = subjectService.list(wrapper);
@@ -1434,8 +1448,8 @@
@ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
})
public R<IPage<TIntegralRecord>> integralDetailParent(String time,
- @RequestParam("pageNum") Integer pageNum,
- @RequestParam("pageSize") Integer pageSize) {
+ Integer pageNum,
+ Integer pageSize) {
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
--
Gitblit v1.7.1