From d20202956f68bd5a7ea98d70f1ff11fe99cf9e5c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 16 九月 2022 10:43:48 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
index 07c40e7..b25dab0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -3,10 +3,8 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.PageHelper;
import com.sandu.common.enums.RoleLevelStatus;
import com.sandu.common.execption.BusinessException;
-import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.redis.RedisService;
import com.sandu.common.security.LoginUserInfo;
import com.sandu.common.security.token.TokenProvider;
@@ -32,7 +30,6 @@
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
import java.util.ArrayList;
import java.util.Collection;
@@ -256,6 +253,13 @@
if (removeById(id)) {
//鍒犺鑹插叧绯昏〃淇℃伅
flag = clientRoleRelationService.removeById(one);
+ List<Pole> poles = SpringContextHolder.getBean(PoleService.class).list(Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, id));
+ poles.forEach(
+ pole -> {
+ pole.setClientId(-1L);
+ }
+ );
+ flag = SpringContextHolder.getBean(PoleService.class).updateBatchById(poles);
//鍒犻櫎澶辫触鍥炴粴鏁版嵁
if (!flag) {
throw new BusinessException("鍒犻櫎鐢ㄦ埛澶辫触锛�");
@@ -398,7 +402,7 @@
if (one != null && one.getSuperiorId() != null) {
return one.getSuperiorId();
} else {
- return userId;
+ return -1L;
}
}
--
Gitblit v1.9.3