From b87239353afdc0c9502e81961249d527dd8ad54e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 27 五月 2024 15:19:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java
index ac6d2ed..88c8287 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java
@@ -207,15 +207,18 @@
vm.setDepartmentIds(examPaperDepartmentService.getByExamPaperId(examPaper.getId())
.stream().map(ExamPaperDepartment::getDepartmentId).toArray(Integer[]::new));
List<ExamPaperUser> examPaperUsers = examPaperUserService.getByExamPaperId(examPaper.getId());
- List userIds = new ArrayList();
+ List<Integer> userIds = new ArrayList();
+ List<String> userNames = new ArrayList();
for (int i = 0; i < examPaperUsers.size(); i++) {
User user = userService.getUserById(examPaperUsers.get(i).getUserId());
if (ObjectUtils.isNotEmpty(user)) {
Integer userId = examPaperUsers.get(i).getUserId();
userIds.add(userId);
+ userNames.add(user.getRealName());
}
}
- vm.setUserId(userIds);
+ vm.setUserIds(userIds);
+ vm.setUserNames(userNames);
return vm;
}
--
Gitblit v1.8.0