From f45610bb9bfd6c0ee95959e0849aa7830ddfc5f3 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 18:01:56 +0800
Subject: [PATCH] 客户新增优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 104453e..06b6be0 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
@@ -20,7 +20,6 @@
import org.springframework.stereotype.Service;
import java.util.List;
-import java.util.Objects;
@Service
@AllArgsConstructor
@@ -37,17 +36,17 @@
if (getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, addClientPrarm.getClientName().trim())) != null) {
throw new BusinessException("璇ョ敤鎴峰悕宸插瓨鍦紒");
}
-// Long userId = SecurityUtils.getUserId();
+ Long userId = SecurityUtils.getUserId();
boolean clientId = findClientId();
- //鍒ゆ柇鏄惁涓轰簩绾у鎴� 濡傛灉鏄簩绾у鎴峰垯涓嶈兘缁х画娣诲姞
- if (SecurityUtils.getClientId() != null && !clientId) {
+ //鍒ゆ柇鏄惁涓轰簩绾у鎴� 濡傛灉鏄簩绾у鎴峰垯涓嶈兘缁х画娣诲姞 涓�绾у鎴蜂负FALSE
+ if (SecurityUtils.getClientId() != null && clientId) {
throw new BusinessException("鏉冮檺涓嶈冻,浜岀骇瀹㈡埛涓嶈兘鏂板鐢ㄦ埛锛�");
}
Client client = new Client();
- if (SecurityUtils.getClientId() != null && clientId) {
+ if (SecurityUtils.getClientId() != null && !clientId) {
//涓�绾у鎴锋柊澧炵敤鎴锋椂 榛樿涓鸿嚜宸卞悕涓嬬殑浜岀骇瀹㈡埛
client.setSuperiorId(SecurityUtils.getUserId());
client.setClientSuperior(addClientPrarm.getClientSuperior());
@@ -108,17 +107,19 @@
if (client1 != null && !client1.getId().equals(one.getId())) {
throw new BusinessException("璇ョ敤鎴峰悕宸插瓨鍦紒");
}
+
//鍒ゆ柇涓婄骇鐢ㄦ埛鏄惁瀛樺湪
boolean clientId = findClientId();
-
+ Long userId = SecurityUtils.getUserId();
//鍒ゆ柇鏇存敼鐨勭敤鎴锋槸鍚︽槸灞炰簬鑷繁鍚嶄笅鐨勪簩绾у鎴�
- if(SecurityUtils.getClientId() != null && clientId){
- if(!Objects.equals(one.getSuperiorId(), SecurityUtils.getUserId())){
+ if (SecurityUtils.getClientId() != null && !clientId) {
+ if (SecurityUtils.getUserId() != one.getSuperiorId()) {
throw new BusinessException("鏉冮檺涓嶈冻锛屼笉鑳芥洿鏀瑰叾浠栧鎴风殑鎵�灞炲鎴蜂俊鎭紒");
}
}
Client client = new Client();
+ client.setClientName(updateClientPrarm.getClientName());
if (SecurityUtils.getClientId() != null && clientId) {
//涓�绾у鎴锋柊澧炵敤鎴锋椂 榛樿涓鸿嚜宸卞悕涓嬬殑浜岀骇瀹㈡埛
client.setSuperiorId(SecurityUtils.getUserId());
@@ -142,7 +143,6 @@
client.setLinkMan(updateClientPrarm.getLinkMan());
client.setMobile(updateClientPrarm.getMobile());
- // update(client);
return updateById(client);
}
--
Gitblit v1.9.3