From 4e53338c0c6859a43693f3f690f0c05da888a02e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 11:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java
index 6e83d63..890dcd3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java
@@ -148,6 +148,13 @@
} else {
list = interphoneSubMapper.getInterphoneSubList(keyword, SecurityUtils.getUserId());
}
+ list.forEach(interphoneSubBo -> {
+ InterphoneHostSubPole one = SpringContextHolder.getBean(InterphoneHostSubService.class).getOne(Wrappers.lambdaQuery(InterphoneHostSubPole.class)
+ .eq(InterphoneHostSubPole::getSubId, interphoneSubBo.getSubId()));
+ if (one != null) {
+ interphoneSubBo.setHostId(one.getHostId());
+ }
+ });
return list;
}
}
--
Gitblit v1.9.3