From ee8a9ad78bfa39164582615f2b139c1df74c2bb4 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 17 Oct 2020 09:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=94=A8=E6=88=B7=E6=89=8B?=
=?UTF-8?q?=E6=9C=BA=E9=82=AE=E7=AE=B1=E9=83=A8=E9=97=A8=E5=BF=85=E5=A1=AB?=
=?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../web/controller/system/SysUserController.java | 13 +++++++++----
.../main/resources/templates/system/user/add.html | 12 ++++++------
.../main/resources/templates/system/user/edit.html | 12 ++++++------
3 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index f5109d29..7d6846ba 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -19,6 +19,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.shiro.service.SysPasswordService;
import com.ruoyi.framework.util.ShiroUtils;
@@ -125,11 +126,13 @@ public class SysUserController extends BaseController
{
return error("新增用户'" + user.getLoginName() + "'失败，登录账号已存在");
}
- else if (UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+ else if (StringUtils.isNotEmpty(user.getPhonenumber())
+ && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
{
return error("新增用户'" + user.getLoginName() + "'失败，手机号码已存在");
}
- else if (UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+ else if (StringUtils.isNotEmpty(user.getEmail())
+ && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
{
return error("新增用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
}
@@ -162,11 +165,13 @@ public class SysUserController extends BaseController
public AjaxResult editSave(@Validated SysUser user)
{
userService.checkUserAllowed(user);
- if (UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+ if (StringUtils.isNotEmpty(user.getPhonenumber())
+ && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
{
return error("修改用户'" + user.getLoginName() + "'失败，手机号码已存在");
}
- else if (UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+ else if (StringUtils.isNotEmpty(user.getEmail())
+ && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
{
return error("修改用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
}
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html
index 1d6c93a3..c7f25c5a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html
@@ -20,10 +20,10 @@
</div>
<div class="col-sm-6">
<div class="form-group">
- <label class="col-sm-4 control-label is-required">归属部门：</label>
+ <label class="col-sm-4 control-label">归属部门：</label>
<div class="col-sm-8">
<div class="input-group">
- <input name="deptName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择归属部门" class="form-control" required>
+ <input name="deptName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择归属部门" class="form-control">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
@@ -33,10 +33,10 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
- <label class="col-sm-4 control-label is-required">手机号码：</label>
+ <label class="col-sm-4 control-label">手机号码：</label>
<div class="col-sm-8">
<div class="input-group">
- <input id="phonenumber" name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text" maxlength="11" required>
+ <input id="phonenumber" name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text" maxlength="11">
<span class="input-group-addon"><i class="fa fa-mobile"></i></span>
</div>
</div>
@@ -44,10 +44,10 @@
</div>
<div class="col-sm-6">
<div class="form-group">
- <label class="col-sm-4 control-label is-required">邮箱：</label>
+ <label class="col-sm-4 control-label">邮箱：</label>
<div class="col-sm-8">
<div class="input-group">
- <input id="email" name="email" class="form-control email" type="text" maxlength="50" placeholder="请输入邮箱" required>
+ <input id="email" name="email" class="form-control email" type="text" maxlength="50" placeholder="请输入邮箱">
<span class="input-group-addon"><i class="fa fa-envelope"></i></span>
</div>
</div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
index 8e2464e4..3d598dbd 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
@@ -21,10 +21,10 @@
</div>
<div class="col-sm-6">
<div class="form-group">
- <label class="col-sm-4 control-label is-required">归属部门：</label>
+ <label class="col-sm-4 control-label">归属部门：</label>
<div class="col-sm-8">
<div class="input-group">
- <input class="form-control" type="text" name="deptName" onclick="selectDeptTree()" id="treeName" th:field="*{dept.deptName}" required>
+ <input class="form-control" type="text" name="deptName" onclick="selectDeptTree()" id="treeName" th:field="*{dept.deptName}">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
@@ -34,10 +34,10 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
- <label class="col-sm-4 control-label is-required">手机号码：</label>
+ <label class="col-sm-4 control-label">手机号码：</label>
<div class="col-sm-8">
<div class="input-group">
- <input name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text" maxlength="11" th:field="*{phonenumber}" required>
+ <input name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text" maxlength="11" th:field="*{phonenumber}">
<span class="input-group-addon"><i class="fa fa-mobile"></i></span>
</div>
</div>
@@ -45,10 +45,10 @@
</div>
<div class="col-sm-6">
<div class="form-group">
- <label class="col-sm-4 control-label is-required">邮箱：</label>
+ <label class="col-sm-4 control-label">邮箱：</label>
<div class="col-sm-8">
<div class="input-group">
- <input name="email" class="form-control email" type="text" maxlength="50" placeholder="请输入邮箱" th:field="*{email}" required>
+ <input name="email" class="form-control email" type="text" maxlength="50" placeholder="请输入邮箱" th:field="*{email}">
<span class="input-group-addon"><i class="fa fa-envelope"></i></span>
</div>
</div>