From 126ae649e7bbe07369d8802dd06f546fee138cb1 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 14:29:43 +0800
Subject: [PATCH] 修改用户arp问题

---
 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