diff --git a/inspect-admin/src/main/java/com/inspect/admin/service/SysLoginService.java b/inspect-admin/src/main/java/com/inspect/admin/service/SysLoginService.java index f244062..cb2363c 100644 --- a/inspect-admin/src/main/java/com/inspect/admin/service/SysLoginService.java +++ b/inspect-admin/src/main/java/com/inspect/admin/service/SysLoginService.java @@ -126,9 +126,7 @@ public class SysLoginService { String username = userInfo.getUsername(); if(!roles.contains("admin")) { String aollowIp = userInfo.getSysUser().getAollowIp(); - if(StringUtils.isBlank(aollowIp)) { - throw new ServiceException("用户未绑定登录ip,不允许登录"); - } else if (StringUtils.equals("*",aollowIp)) { + if (StringUtils.isBlank(aollowIp) || StringUtils.equals("*", aollowIp)) { logger.info("允许用户任意ip登录"); } else if(!StringUtils.equals(requestIp, aollowIp)) { try { diff --git a/inspect-management/src/main/java/com/inspect/system/controller/SysUserController.java b/inspect-management/src/main/java/com/inspect/system/controller/SysUserController.java index 9170725..9accb92 100644 --- a/inspect-management/src/main/java/com/inspect/system/controller/SysUserController.java +++ b/inspect-management/src/main/java/com/inspect/system/controller/SysUserController.java @@ -160,10 +160,7 @@ public class SysUserController extends BaseController { ) @PostMapping public AjaxResult add(@Validated @RequestBody SysUser user) { - String allowIp = user.getAollowIp(); - if (StringUtils.isBlank(allowIp)) { - return AjaxResult.error("请填写允许登录的ip"); - } else if ("1".equals(this.userService.checkUserNameUnique(user.getUserName()))) { + if ("1".equals(this.userService.checkUserNameUnique(user.getUserName()))) { return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,登录账号已存在"); } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && "1".equals(this.userService.checkPhoneUnique(user))) { return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,手机号码已存在"); diff --git a/inspect-management/src/main/resources/mapper/system/SysUserMapper.xml b/inspect-management/src/main/resources/mapper/system/SysUserMapper.xml index 4fede12..0449ff1 100644 --- a/inspect-management/src/main/resources/mapper/system/SysUserMapper.xml +++ b/inspect-management/src/main/resources/mapper/system/SysUserMapper.xml @@ -232,6 +232,7 @@ login_date = #{loginDate}, update_by = #{updateBy}, remark = #{remark}, + aollow_ip = #{aollowIp}, update_time = sysdate() where user_id = #{userId}