From 176b4072534a7bffdd108222251d798059da5f25 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 07 七月 2022 16:23:48 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 a436cb0..4c99cb9 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
@@ -17,6 +17,7 @@
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@@ -57,6 +58,7 @@
/**
* 淇敼瀛愯澶�
*/
+ @Transactional(rollbackFor = Exception.class)
public boolean updateSub(Integer id, InterphoneSubParam interphoneSubParam) {
InterphoneSub byId = getById(id);
if (byId == null) {
@@ -84,11 +86,17 @@
/**
* 缂栬緫涓�閿眰鍔╁瓙璁惧 鏃ュ織璁板綍缁撴潫
*/
- boolean b = updateById(interphoneSub);
List<InterphoneSub> list = list(Wrappers.lambdaQuery(InterphoneSub.class).eq(InterphoneSub::getSubMac, interphoneSubParam.getSubMac()));
- if (list.size() > 1) {
- throw new BusinessException("璇锋鏌ヨ澶噈ac鏄惁閲嶅");
+ if (list.size() > 0) {
+ list.forEach(
+ sub->{
+ if(!sub.getSubId().equals(id)){
+ throw new BusinessException("璇锋鏌ヨ澶噈ac鏄惁閲嶅");
+ }
+ }
+ );
}
+ boolean b = updateById(interphoneSub);
return b;
}
--
Gitblit v1.9.3