From df24297fdbd1b5ad72dae1624ecf75c9c0774d27 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Sun, 27 Mar 2022 15:52:22 +0800 Subject: [PATCH] =?UTF-8?q?sweb=E4=BE=9B=E5=BA=94=E5=95=86=E8=87=AA?= =?UTF-8?q?=E5=8A=A9=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81---=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=8F=AF=E4=BB=A5=E9=82=AE=E7=AE=B1=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=8B=B1=E6=96=87=E9=80=97=E5=8F=B7=E5=81=9A?= =?UTF-8?q?=E5=88=86=E9=9A=94=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/controller/base/WhiteController.java | 7 ++++++- .../core/apiservice/serviceimpl/busi/SysUserService.java | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index 8f01ef5..506b441 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -964,7 +964,12 @@ public class WhiteController extends CoreBaseController { public ResultBean querySysUser(@RequestBody SysUser sysUser){ ValidatorBean.checkNotNull(sysUser.getUserLoginName(),"用户登录名不能为空!"); ValidatorBean.checkNotNull(sysUser.getUserEmail(),"用户email不能为空!"); - SysUser user = sysUserService.getSysUserByLoginNameAndEmail(sysUser.getUserLoginName(), sysUser.getUserEmail()); + SysUser user = null; + try { + user = sysUserService.getSysUserByLoginNameAndEmail(sysUser.getUserLoginName(), sysUser.getUserEmail()); + } catch (ImppBusiException e) { + return ResultBean.fail(e.getMessage()); + } return ResultBean.success("查询成功!").setResultObject(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 883a729..07f26af 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 @@ -718,8 +718,18 @@ public class SysUserService implements ISysUserService { public SysUser getSysUserByLoginNameAndEmail(String loginName, String email) { LOGGER.debug("平台用户 SYS_USER find By Login Name :{}，and email:{}", loginName,email); - return userRDao.getByProperty(new String[]{"userLoginName", "userEmail","isValid","isDeleted"}, - new Object[]{loginName, email,CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()}); + SysUser sysUser = userRDao.getByProperty(new String[]{"userLoginName", "isValid", "isDeleted"}, + new Object[]{loginName, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()}); + if (!Objects.isNull(sysUser)){ + String emails = sysUser.getUserEmail(); + if (Strings.isNotBlank(emails)){ + List emailList = Arrays.asList(emails.split(",")); + if (emailList.contains(email)){ + return sysUser; + } + } + } + throw ImppExceptionBuilder.newInstance().setErrorDetail("账号与邮箱不匹配!").build(); } @Override