From e1233e936140239f45a6c7c23dfdf182599f87f2 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 30 Nov 2018 01:48:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/busi/SysUserController.java | 6 +++--- .../i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java | 2 +- .../i3plus/core/apiservice/serviceimpl/busi/SysUserService.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 90e6358..aff3dd1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -446,17 +446,17 @@ public class SysUserController extends CoreBaseController{ sysUserService.updateSysUser(user); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { - return ResultBean.success("操作失败") + return ResultBean.fail("操作失败") .setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()) .setErrorMsg("请勿修改邮箱信息"); } }else { - return ResultBean.success("操作失败") + return ResultBean.fail("操作失败") .setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()) .setErrorMsg("验证码错误请重新输入"); } }else { - return ResultBean.success("操作失败") + return ResultBean.fail("操作失败") .setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()) .setErrorMsg("验证码已过期"); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index c7d3736..7e523bb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java @@ -101,7 +101,7 @@ public class SystemLoginService implements ISystemLoginService { if(num >= CommonConstWords.USER_LOGIN_ERROR_MAX_NUM){ - user.setUserStatus(CommonEnumUtil.USER_STATUS.LOCKING.getValue()); +// user.setUserStatus(CommonEnumUtil.USER_STATUS.LOCKING.getValue()); redisCore.putObject(redisKey,num,0); // 账号锁定后移除锁 sysUserRDao.update(user); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index aa58aed..81506f5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -333,7 +333,7 @@ public class SysUserService implements ISysUserService { int count; if(id > 0){ StringBuffer sw = new StringBuffer(); - HqlPack.getStringEqualPackOr(userLoginName,"userLoginName",sw); + HqlPack.getStringEqualPack(userLoginName,"userLoginName",sw); HqlPack.getNumNOEqualPack(id,"id",sw); count = sysUserRDao.findByHqlWhereCount(sw.toString()); @@ -349,7 +349,7 @@ public class SysUserService implements ISysUserService { int count; if(id > 0){ StringBuffer sw = new StringBuffer(); - HqlPack.getStringEqualPackOr(email,"userEmail",sw); + HqlPack.getStringEqualPack(email,"userEmail",sw); HqlPack.getNumNOEqualPack(id,"id",sw); count = sysUserRDao.findByHqlWhereCount(sw.toString()); @@ -365,7 +365,7 @@ public class SysUserService implements ISysUserService { int count; if(id > 0){ StringBuffer sw = new StringBuffer(); - HqlPack.getStringEqualPackOr(phone,"userPhone",sw); + HqlPack.getStringEqualPack(phone,"userPhone",sw); HqlPack.getNumNOEqualPack(id,"id",sw); count = sysUserRDao.findByHqlWhereCount(sw.toString());