From 8f55b92a5a936d3358bb8a9f2fe67c697ba99be0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 06 一月 2026 15:09:46 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
index cc0341d..ad1ee7e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
@@ -286,24 +286,26 @@
List<Long> receiptsUserIds = samplingRecordOperations.stream().map(TSamplingRecordOperation::getReceiptsPersonId).collect(Collectors.toList());
userIds.addAll(sendUserIds);
userIds.addAll(receiptsUserIds);
- List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
- for (TSamplingRecordOperation samplingRecordOperation : samplingRecordOperations) {
- if(Objects.nonNull(samplingRecordOperation.getHandlePersonId())){
- List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getHandlePersonId())).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(users)){
- samplingRecordOperation.setHandlePersonName(users.get(0).getNickName());
+ if(!CollectionUtils.isEmpty(userIds)){
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ for (TSamplingRecordOperation samplingRecordOperation : samplingRecordOperations) {
+ if(Objects.nonNull(samplingRecordOperation.getHandlePersonId())){
+ List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getHandlePersonId())).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(users)){
+ samplingRecordOperation.setHandlePersonName(users.get(0).getNickName());
+ }
}
- }
- if(Objects.nonNull(samplingRecordOperation.getSendPersonId())){
- List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getSendPersonId())).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(users)){
- samplingRecordOperation.setSendPersonName(users.get(0).getNickName());
+ if(Objects.nonNull(samplingRecordOperation.getSendPersonId())){
+ List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getSendPersonId())).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(users)){
+ samplingRecordOperation.setSendPersonName(users.get(0).getNickName());
+ }
}
- }
- if(Objects.nonNull(samplingRecordOperation.getReceiptsPersonId())){
- List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getReceiptsPersonId())).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(users)){
- samplingRecordOperation.setReceiptsPersonName(users.get(0).getNickName());
+ if(Objects.nonNull(samplingRecordOperation.getReceiptsPersonId())){
+ List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getReceiptsPersonId())).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(users)){
+ samplingRecordOperation.setReceiptsPersonName(users.get(0).getNickName());
+ }
}
}
}
--
Gitblit v1.7.1