From f8c33ad3fb09dd0f70b68b74d59ce28761142bf0 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
index 421ac31..481de34 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
@@ -53,7 +53,11 @@
public boolean register(AdminParam param) {
Admin admin = findByUserName(param.getUsername());
if (admin != null) {
- throw new BusinessException("褰撳墠璐﹀彿" + param.getUsername() + "宸茬粡瀛樺湪");
+ throw new BusinessException("褰撳墠璐﹀彿" + param.getUsername() + "宸茬粡鍦ㄧ鐞嗗憳涓瓨鍦�");
+ }
+ Client one = SpringContextHolder.getBean(ClientService.class).getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, param.getUsername()));
+ if (one != null) {
+ throw new BusinessException("褰撳墠璐﹀彿" + param.getUsername() + "宸茬粡鍦ㄥ鎴蜂腑瀛樺湪");
}
Admin save = new Admin();
save.setId(snowflake.nextId());
--
Gitblit v1.9.3