From c61daa1070487b6adeff3438633c10f750ac45ab Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 06 七月 2022 15:11:30 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostSubService.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostSubService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostSubService.java
index 3ba03ba..5b490f8 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostSubService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostSubService.java
@@ -1,8 +1,11 @@
 package com.sandu.ximon.admin.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.sandu.common.execption.BusinessException;
 import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.dao.domain.InterphoneHost;
 import com.sandu.ximon.dao.domain.InterphoneHostSubPole;
 import com.sandu.ximon.dao.mapper.InterphoneHostSubPoleMapper;
 import lombok.AllArgsConstructor;
@@ -26,6 +29,11 @@
         }
 
         InterphoneHostSubPole pole = new InterphoneHostSubPole();
+        InterphoneHost host = SpringContextHolder.getBean(InterphoneHostService.class).getById(hostId);
+        InterphoneHost sub = SpringContextHolder.getBean(InterphoneHostService.class).getById(subId);
+        if (host == null && sub == null) {
+            throw new BusinessException("涓昏澶囨垨瀛愯澶囦笉瀛樺湪");
+        }
         pole.setHostId(hostId);
         pole.setSubId(subId);
         return save(pole);
@@ -38,10 +46,11 @@
         if (subId == null) {
             throw new BusinessException("瀛愯澶噄d涓嶈兘涓虹┖");
         }
-        InterphoneHostSubPole one = getOne(Wrappers.lambdaQuery(InterphoneHostSubPole.class).eq(InterphoneHostSubPole::getSubId, subId));
+        LambdaQueryWrapper<InterphoneHostSubPole> eq = Wrappers.lambdaQuery(InterphoneHostSubPole.class).eq(InterphoneHostSubPole::getSubId, subId);
+        InterphoneHostSubPole one = getOne(eq);
         if (one == null) {
             throw new BusinessException("缁戝畾鍏崇郴涓嶅瓨鍦�");
         }
-        return removeById(one);
+        return remove(eq);
     }
 }

--
Gitblit v1.9.3