bug修改

xuhy

2026-01-06 8f55b92a5a936d3358bb8a9f2fe67c697ba99be0

 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());
                    }
                }
            }
        }