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