diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java index 084cf078..81781746 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java @@ -275,6 +275,35 @@ public class QualityNotificationControllerService { // 通知对象类型名称 if (vo.getTargetType() != null) { vo.setTargetTypeName(vo.getTargetType() == 1 ? "全部" : "手动选择"); + if (vo.getTargetType() == 2) { + List users = notificationUserService.lambdaQuery() + .eq(QmsQualityNotificationUser::getNotificationId, vo.getId()) + .list(); + if (CollectionUtil.isNotEmpty(users)) { + List userIds = users.stream() + .map(QmsQualityNotificationUser::getUserId) + .collect(Collectors.toList()); + List userList = userService.listByIds(userIds); + + List userVOs = new ArrayList<>(); + for (QmsQualityNotificationUser nu : users) { + User user = userList.stream() + .filter(u -> u.getId().equals(nu.getUserId())) + .findFirst() + .orElse(null); + if (user != null) { + QmsQualityNotificationUserVO userVO = new QmsQualityNotificationUserVO(); + userVO.setId(nu.getId()); + userVO.setNotificationId(nu.getNotificationId()); + userVO.setUserId(nu.getUserId()); + userVO.setUserName(user.getUserName()); + userVO.setUserCode(user.getUserCode()); + userVOs.add(userVO); + } + } + vo.setUsers(userVOs); + } + } } // 启用状态名称 if (vo.getEnable() != null) {