From 5de4a49148636dce6568d37e4c62039934b0a188 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 十月 2025 16:36:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java | 36 ++----------------------------------
1 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java
index 4372e74..7cb32fb 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java
@@ -50,41 +50,9 @@
@PostMapping("/listAll")
@ApiOperation(value = "列表查询", tags = {"反馈管理"})
public AjaxResult<PageInfo<FeedbackVO>> listAll(FeedbackQuery query){
-// if (query.getEndTime()!=null){
-// query.getEndTime().setHours(23);
-// query.getEndTime().setMinutes(59);
-// query.getEndTime().setSeconds(59);
-// }
- List<FeedbackVO> list = feedbackService.listAll(query);
- List<FeedbackVO> result = new ArrayList<>();
- for (FeedbackVO feedbackVO : list) {
- TUser data = studyClient.getUserById(feedbackVO.getUserId()).getData();
- if (data == null )continue;
-
- feedbackVO.setName(data.getName());
- feedbackVO.setPhone(data.getPhone());
- if (!StringUtils.hasLength(query.getPhone()) && !StringUtils.hasLength(query.getUserName())) {
- result.add(feedbackVO);
- continue;
- }
- // 如果筛选条件输入了电话或者姓名那么需要过滤掉不符合条件的数据
- if (StringUtils.hasLength(query.getPhone()) && StringUtils.hasLength(query.getUserName())) {
- if (feedbackVO.getPhone().contains(query.getPhone()) && feedbackVO.getName().contains(query.getUserName())) {
- result.add(feedbackVO);
- }
- } else if (StringUtils.hasLength(query.getPhone())) {
- if (feedbackVO.getPhone().contains(query.getPhone())) {
- result.add(feedbackVO);
- }
- } else if (StringUtils.hasLength(query.getUserName())) {
- if (feedbackVO.getName().contains(query.getUserName())) {
- result.add(feedbackVO);
- }
- }
- }
PageInfo<FeedbackVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
- res.setTotal(result.size());
- res.setRecords(result);
+ List<FeedbackVO> list = feedbackService.listAll(query,res);
+ res.setRecords(list);
return AjaxResult.success(res);
}
--
Gitblit v1.7.1