From 05f71eff9a356615db7629e8a439d451dfab60f7 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 02 二月 2021 08:47:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/controller/UserMngController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
index 9656bc2..92407d3 100644
--- a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
@@ -412,8 +412,14 @@
return;
}
- // 检查ARP号
- if (this.sysUserService.isSysUserExist(this.sysUser.getArp(), null, null, this.sysUser.getId())) {
+ // 检查ARP号 //除自己外的arp
+// if (this.sysUserService.isSysUserExist(this.sysUser.getArp(), null, null, this.sysUser.getId())) {
+// FacesUtils.warn("ARP已存在。");
+// return;
+// }
+ List<SysUser> list = sysUserService.getUserByArp(this.sysUser.getArp());
+ assert list.size() < 2;
+ if (list.size() > 0 && !list.get(0).getId().equals(this.sysUser.getId())) {
FacesUtils.warn("ARP已存在。");
return;
}
--
Gitblit v1.9.2