From 4bc9e8a3962a01dd204185039c29c40b734ea4a4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 11 五月 2022 16:06:37 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 6b27b1f..58bef1f 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
@@ -1,11 +1,16 @@
package com.sandu.ximon.admin.service;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.InterphoneSubParam;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.dao.bo.InterphoneHostBo;
import com.sandu.ximon.dao.bo.InterphoneSubBo;
+import com.sandu.ximon.dao.domain.InterphoneHostSubPole;
import com.sandu.ximon.dao.domain.InterphoneSub;
+import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.InterphoneSubMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -18,6 +23,7 @@
public class InterphoneSubService extends BaseServiceImpl<InterphoneSubMapper, InterphoneSub> {
private final InterphoneSubMapper interphoneSubMapper;
+ private final InterphoneHostSubService interphoneHostSubService;
/**
* 鏂板瀛愯澶�
@@ -36,6 +42,10 @@
if (byId == null) {
return false;
}
+ boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getSubMac(), PoleBindingEnums.FOR_HELP);
+ if (!belong) {
+ throw new RuntimeException("璇ヨ澶囦笉灞炰簬鎮�,涓嶈兘淇敼璁惧淇℃伅");
+ }
InterphoneSub interphoneSub = new InterphoneSub();
BeanUtils.copyProperties(interphoneSubParam, interphoneSub);
interphoneSub.setSubId(id);
@@ -47,6 +57,10 @@
*/
public boolean deleteSub(Integer id) {
InterphoneSub byId = getById(id);
+ InterphoneHostSubPole one = interphoneHostSubService.getOne(Wrappers.lambdaQuery(InterphoneHostSubPole.class).eq(InterphoneHostSubPole::getSubId, id));
+ if (one != null) {
+ throw new RuntimeException("璇ュ瓙璁惧瀛樺湪缁戝畾鍏崇郴锛屼笉鑳藉垹闄�");
+ }
if (byId == null) {
return false;
}
@@ -67,7 +81,10 @@
/**
* 鏌ヨ涓绘満鍒楄〃
*/
- public List<InterphoneSubBo> getInterphoneSubList(String keyword) {
+ public List<InterphoneSubBo> getInterphoneSubList(BaseConditionVO baseConditionVO, String keyword) {
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
List<InterphoneSubBo> list;
if (SecurityUtils.getClientId() == null) {
list = interphoneSubMapper.getInterphoneSubList(keyword, null);
--
Gitblit v1.9.3