From b123947a669813c5aaa7fed431e1065f70edf09f Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 08 三月 2022 16:09:10 +0800
Subject: [PATCH] 用户新增密码字段fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 27 ++++++++++++++-------------
ximon-admin/src/main/java/com/sandu/ximon/admin/param/ClientPrarm.java | 2 --
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 5 +++--
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
index 94aa0d8..5170987 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -7,6 +7,7 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.context.CustomerInspectContextHolder;
+import com.sandu.ximon.admin.param.AddClientPrarm;
import com.sandu.ximon.admin.param.ClientPrarm;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.ClientService;
@@ -27,8 +28,8 @@
private final ClientService clientService;
@PostMapping("/add")
- public ResponseVO<Object> addClient(@RequestBody @Validated ClientPrarm clientPrarm) {
- boolean b = clientService.addClient(clientPrarm);
+ public ResponseVO<Object> addClient(@RequestBody @Validated AddClientPrarm addClientPrarm) {
+ boolean b = clientService.addClient(addClientPrarm);
if (b) {
return ResponseUtil.success("娣诲姞鎴愬姛");
} else {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ClientPrarm.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ClientPrarm.java
index 8689c97..301a845 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ClientPrarm.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ClientPrarm.java
@@ -15,7 +15,5 @@
private String linkMan;
@NotEmpty
private String mobile;
- @NotEmpty
- private String password;
}
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 e6bd78d..9da3101 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
@@ -5,6 +5,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.param.AddClientPrarm;
import com.sandu.ximon.admin.param.ClientPrarm;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.Client;
@@ -23,26 +24,26 @@
private final PasswordEncoder passwordEncoder;
- public boolean addClient(ClientPrarm clientPrarm) {
+ public boolean addClient(AddClientPrarm addClientPrarm) {
- if (getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientName().trim())) != null) {
+ if (getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, addClientPrarm.getClientName().trim())) != null) {
throw new BusinessException("璇ョ敤鎴峰悕宸插瓨鍦紒");
}
Client client = new Client();
- if (clientPrarm.getClientSuperior() != null && !"".equals(clientPrarm.getClientSuperior())) {
- Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientSuperior()));
+ if (addClientPrarm.getClientSuperior() != null && !"".equals(addClientPrarm.getClientSuperior())) {
+ Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, addClientPrarm.getClientSuperior()));
if (one != null) {
client.setSuperiorId(one.getId());
} else {
throw new BusinessException("涓婄骇瀹㈡埛涓嶅瓨鍦�");
}
}
- client.setClientName(clientPrarm.getClientName());
- client.setLinkMan(clientPrarm.getLinkMan());
- client.setMobile(clientPrarm.getMobile());
- client.setClientSuperior(clientPrarm.getClientSuperior());
- client.setPassword(passwordEncoder.encode(clientPrarm.getPassword()));
+ client.setClientName(addClientPrarm.getClientName());
+ client.setLinkMan(addClientPrarm.getLinkMan());
+ client.setMobile(addClientPrarm.getMobile());
+ client.setClientSuperior(addClientPrarm.getClientSuperior());
+ client.setPassword(passwordEncoder.encode(addClientPrarm.getPassword()));
return save(client);
@@ -57,18 +58,20 @@
}
//鍒ゆ柇鐢ㄦ埛鍚嶆槸鍚﹂噸澶�
- if (getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientName().trim())) != null) {
+ Client client1 = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientName().trim()));
+ if (client1 != null && !client1.getId().equals(one.getId())) {
throw new BusinessException("璇ョ敤鎴峰悕宸插瓨鍦紒");
}
//鍒ゆ柇涓婄骇鐢ㄦ埛鏄惁瀛樺湪
Client client = new Client();
- if (clientPrarm.getClientSuperior() != null) {
+ if (clientPrarm.getClientSuperior() != null && clientPrarm.getClientSuperior().trim().length() != 0) {
Client superior = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientSuperior()));
if (superior != null) {
if (superior.getId().equals(one.getId())) {
throw new BusinessException("涓婄骇瀹㈡埛涓烘湰璐︽埛锛�");
} else {
client.setSuperiorId(superior.getId());
+ client.setClientSuperior(clientPrarm.getClientSuperior());
}
} else {
throw new BusinessException("涓婄骇瀹㈡埛涓嶅瓨鍦�");
@@ -78,8 +81,6 @@
client.setClientName(clientPrarm.getClientName());
client.setLinkMan(clientPrarm.getLinkMan());
client.setMobile(clientPrarm.getMobile());
- client.setClientSuperior(clientPrarm.getClientSuperior());
- client.setPassword(passwordEncoder.encode(clientPrarm.getPassword()));
// update(client);
return updateById(client);
--
Gitblit v1.9.3