From 91c48c0c3a937e82eb33cb88d164327a01ce02d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Sat, 15 Jul 2023 22:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=85=A7=E7=89=87=E6=B5=B7?=
=?UTF-8?q?=E5=BA=B7=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../busiz/h5/web/FeedbackApiController.java | 25 +++++++++++--------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java
index 818a19ba..f46283f1 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java
@@ -23,10 +23,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import static com.mortals.framework.ap.SysConstains.*;
@@ -82,13 +79,19 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
//宸插弽棣�
//鏌ヨ鎴戝凡缁忓洖绛旇繃鐨�
List<Long> feedbackIdList = answerService.find(new FeedbackAnswerQuery().staffId(context.getUser().getCustomerId())).stream().map(i -> i.getFeedbackId()).distinct().collect(Collectors.toList());
- FeedbackQuery feedbackQuery = new FeedbackQuery();
- feedbackQuery.setIdList(feedbackIdList);
-
- Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
- model.put(PAGEINFO_KEY, result.getPageInfo());
- model.put(KEY_RESULT_DATA, result.getList());
- parsePageInfo(model, result.getPageInfo());
+ if(ObjectUtils.isEmpty(feedbackIdList)){
+ pageAllInfo.setTotalResult(0);
+ model.put(PAGEINFO_KEY, pageAllInfo);
+ model.put(KEY_RESULT_DATA, new ArrayList<>());
+ parsePageInfo(model, pageAllInfo);
+ }else{
+ FeedbackQuery feedbackQuery = new FeedbackQuery();
+ feedbackQuery.setIdList(feedbackIdList);
+ Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
+ model.put(PAGEINFO_KEY, result.getPageInfo());
+ model.put(KEY_RESULT_DATA, result.getList());
+ parsePageInfo(model, result.getPageInfo());
+ }
} else {
//鏈弽棣�
//鏌ヨ鎴戠殑鍙嶉 浣嗘槸杩樻湭鍥炵瓟鐨�
--
2.24.3