From 106edede40275664cd10939a576eee4b13f53ae8 Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Thu, 27 Jul 2023 08:07:19 +0800
Subject: [PATCH] =?UTF-8?q?#=E5=91=8A=E8=AD=A6=E6=B6=88=E6=81=AF=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.java
index aa406db..759feab 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AbnormalAlarmServiceImpl.java
@@ -208,6 +208,7 @@ public class AbnormalAlarmServiceImpl extends BaseServiceImpl<AbnormalAlarmMappe
 			BusinessMessageDTO message = new BusinessMessageDTO();
 			message.setDeptId(depts.get(0));
 			message.setBusinessClassify("warning");
+			message.setUserIds(users.stream().map(o->String.valueOf(o.getId())).collect(Collectors.joining(",")));
 			message.setBusinessKey(MessageConstants.BusinessClassifyEnum.WARNING.getKey());
 			message.setSubject(MessageConstants.BusinessClassifyEnum.WARNING.getDescription());
 			message.setTaskId(entity.getId());
@@ -236,7 +237,7 @@ public class AbnormalAlarmServiceImpl extends BaseServiceImpl<AbnormalAlarmMappe
 		}
 		R<Dept> dept = sysClient.getDept(deptId);
 		if(dept.isSuccess() && ObjectUtil.isNotEmpty(dept.getData())){
-			R<List<User>> parents = userClient.userListByDeptId(deptId);
+			R<List<User>> parents = userClient.userListByDeptId(dept.getData().getParentId());
 			if(parents.isSuccess() && CollectionUtil.isNotEmpty(parents.getData())){
 				users.addAll(parents.getData().stream().filter(o->!users.stream().map(User::getId).collect(Collectors.toList()).contains(o.getId())).collect(Collectors.toList()));
 			}