|
|
@ -718,8 +718,18 @@ public class SysUserService implements ISysUserService {
|
|
|
|
public SysUser getSysUserByLoginNameAndEmail(String loginName, String email) {
|
|
|
|
public SysUser getSysUserByLoginNameAndEmail(String loginName, String email) {
|
|
|
|
LOGGER.debug("平台用户 SYS_USER find By Login Name :{},and email:{}", loginName,email);
|
|
|
|
LOGGER.debug("平台用户 SYS_USER find By Login Name :{},and email:{}", loginName,email);
|
|
|
|
|
|
|
|
|
|
|
|
return userRDao.getByProperty(new String[]{"userLoginName", "userEmail","isValid","isDeleted"},
|
|
|
|
SysUser sysUser = userRDao.getByProperty(new String[]{"userLoginName", "isValid", "isDeleted"},
|
|
|
|
new Object[]{loginName, email,CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()});
|
|
|
|
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<String> emailList = Arrays.asList(emails.split(","));
|
|
|
|
|
|
|
|
if (emailList.contains(email)){
|
|
|
|
|
|
|
|
return sysUser;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
throw ImppExceptionBuilder.newInstance().setErrorDetail("账号与邮箱不匹配!").build();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|