From 67157345fe1878681e39ec186ef37ff6b3b5c1fc Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 03 八月 2024 18:07:00 +0800
Subject: [PATCH] 8.3
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
index f674e78..82ebcea 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
@@ -78,6 +78,10 @@
List<User> userList;
if (StringUtils.isNotBlank(userNo)) {
userList = userService.lambdaQuery().like(User::getNickname, userNo).list();
+ if (userList.isEmpty()){
+ Page<EvaluatePageVO> page = new Page<>();
+ return R.ok(page);
+ }
} else {
userList = new ArrayList<>();
}
@@ -91,11 +95,13 @@
evaluatePageRequest.setPageSize(pageSize);
evaluatePageRequest.setUserIdList(userIdList);
R<Page<EvaluatePageVO>> r = evaluateClient.queryPageList(evaluatePageRequest);
- for (EvaluatePageVO record : r.getData().getRecords()) {
- Integer userId = record.getUserId();
- User user = userService.getById(userId);
- if (null != user) {
- record.setUserNo(user.getNickname());
+ if (!r.getData().getRecords().isEmpty()) {
+ for (EvaluatePageVO record : r.getData().getRecords()) {
+ Integer userId = record.getUserId();
+ User user = userService.getById(userId);
+ if (null != user) {
+ record.setUserNo(user.getNickname());
+ }
}
}
return r;
--
Gitblit v1.7.1