From 519b6dd15e33df521ecd0a96e0ed9c1c7698b0d2 Mon Sep 17 00:00:00 2001
From: yinhuaiwei <yinhuaiwei@ht-atia.com>
Date: Fri, 30 Oct 2026 17:27:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BD=93=E7=99=BB=E5=BD=95ip=E5=80=BC?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=88=96*=E6=97=B6=EF=BC=8C=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E4=BB=BB=E6=84=8Fip=E8=BF=9B=E8=A1=8C=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/inspect/admin/service/SysLoginService.java | 4 +---
 .../com/inspect/system/controller/SysUserController.java     | 5 +----
 .../src/main/resources/mapper/system/SysUserMapper.xml       | 1 +
 3 files changed, 3 insertions(+), 7 deletions(-)

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 @@
             <if test="loginDate != null">login_date = #{loginDate},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="aollowIp != null">aollow_ip = #{aollowIp},</if>
             update_time = sysdate()
         </set>
         where user_id = #{userId}