From 4e76b9737e036c18e8a9e840dc443615ffcec348 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 20 十月 2022 12:20:18 +0800
Subject: [PATCH] 大气农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 4c99cb9..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
@@ -83,20 +83,14 @@
"}";
StoreOperationRecordsUtils.storeOperationData(listCode, null, "缂栬緫涓�閿眰鍔╁瓙璁惧", content);
+ boolean b = updateById(interphoneSub);
/**
* 缂栬緫涓�閿眰鍔╁瓙璁惧 鏃ュ織璁板綍缁撴潫
*/
List<InterphoneSub> list = list(Wrappers.lambdaQuery(InterphoneSub.class).eq(InterphoneSub::getSubMac, interphoneSubParam.getSubMac()));
- if (list.size() > 0) {
- list.forEach(
- sub->{
- if(!sub.getSubId().equals(id)){
- throw new BusinessException("璇锋鏌ヨ澶噈ac鏄惁閲嶅");
- }
- }
- );
+ if (list.size() > 1) {
+ throw new BusinessException("璇锋鏌ヨ澶噈ac鏄惁閲嶅");
}
- boolean b = updateById(interphoneSub);
return b;
}
@@ -154,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