Merge remote-tracking branch 'origin/master'

李宇

2021-02-04 1afdf3622484b9a54c4cc4642e38bbf5c815884f

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