Merge remote-tracking branch 'origin/master'

leiSP-admin/src/main/java/com/sooka/web/controller/system/SysUserController.java

@@ -131,10 +131,10 @@ public class SysUserController extends BaseController
         {
             return error("新增用户'" + user.getLoginName() + "'失败，手机号码已存在");
         }
-        else if (UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
-            return error("新增用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
-        }
+//        else if (UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+//        {
+//            return error("新增用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
+//        }
         user.setSalt(ShiroUtils.randomSalt());
         user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
         user.setCreateBy(ShiroUtils.getLoginName());
@@ -172,10 +172,10 @@ public class SysUserController extends BaseController
         {
             return error("修改用户'" + user.getLoginName() + "'失败，手机号码已存在");
         }
-        else if (UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
-        {
-            return error("修改用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
-        }
+//        else if (UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+//        {
+//            return error("修改用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
+//        }
         user.setPinyinShort(PinYinUtil.getFirstSpell(user.getUserName()));
         user.setPinyinFirst(PinYinUtil.getFirstSpell(user.getUserName()).substring(0,1));
         user.setPinyinFull(PinYinUtil.getFullSpell(user.getUserName()));