From 260c7ac160984217306430e7455e288d856e7c94 Mon Sep 17 00:00:00 2001
From: yinhuaiwei <yinhuaiwei@ht-atia.com>
Date: Fri, 23 Oct 2026 17:08:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E7=99=BB=E5=BD=95=E5=BC=82=E5=B8=B8;=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E4=B8=89=E6=96=B9aollowIp=E8=AE=BE=E4=B8=BA*;?=
 =?UTF-8?q?=E5=AF=B9null=E5=80=BC=E5=81=9A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/inspect/admin/service/JoinbrightLoginService.java  | 7 +++----
 .../com/inspect/analysis/utils/ResultAnalysisUtils.java    | 3 +++
 .../main/resources/mapper/ext_sync/ExtOrgSyncMapper.xml    | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/inspect-admin/src/main/java/com/inspect/admin/service/JoinbrightLoginService.java b/inspect-admin/src/main/java/com/inspect/admin/service/JoinbrightLoginService.java
index a6a4fb2..42e720d 100644
--- a/inspect-admin/src/main/java/com/inspect/admin/service/JoinbrightLoginService.java
+++ b/inspect-admin/src/main/java/com/inspect/admin/service/JoinbrightLoginService.java
@@ -50,10 +50,9 @@ public class JoinbrightLoginService {
             throw new ServiceException(MSG_TOKEN_INVALID, ExtAuthConstants.TOKEN_INVALID);
         }
 
-//        JoinbrightUser externalUser = getExternalUser(joinbrightToken);
-//        ensurePlatformUser(externalUser);
-//        LoginUser loginUser = loadPlatformUser(externalUser.getUsername());
-        LoginUser loginUser = loadPlatformUser("user");
+        JoinbrightUser externalUser = getExternalUser(joinbrightToken);
+        ensurePlatformUser(externalUser);
+        LoginUser loginUser = loadPlatformUser(externalUser.getUsername());
         return tokenService.createToken(loginUser);
     }
 
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
index 9a4ec21..56b7bf9 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
@@ -507,6 +507,9 @@ public class ResultAnalysisUtils {
                 .mapToObj(i -> {
                     String val = valueArr[i].trim();
                     if (!NumberUtils.isCreatable(val)) {
+                        if (val == "null") {
+                            return "";
+                        }
                         return val;
                     }
                     // 红外算法，保留1位小数（四舍五入）
diff --git a/inspect-management/src/main/resources/mapper/ext_sync/ExtOrgSyncMapper.xml b/inspect-management/src/main/resources/mapper/ext_sync/ExtOrgSyncMapper.xml
index 7e7a3ec..525b19f 100644
--- a/inspect-management/src/main/resources/mapper/ext_sync/ExtOrgSyncMapper.xml
+++ b/inspect-management/src/main/resources/mapper/ext_sync/ExtOrgSyncMapper.xml
@@ -128,9 +128,9 @@
     <insert id="insertUser" parameterType="com.inspect.system.base.domain.SysUser"
             useGeneratedKeys="true" keyProperty="userId">
         insert into sys_user (ext_id, dept_id, user_name, nick_name, user_type, email, phonenumber, sex,
-                              avatar, password, status, del_flag, create_by, create_time, remark)
+                              avatar, password, status, del_flag, create_by, create_time, remark, aollow_ip)
         values (#{extId}, #{deptId}, #{userName}, #{nickName}, #{userType}, #{email}, #{phonenumber}, '0',
-                '', #{password}, #{status}, '0', #{createBy}, now(), #{remark})
+                '', #{password}, #{status}, '0', #{createBy}, now(), #{remark}, #{aollowIp})
     </insert>
 
     <update id="updateUser" parameterType="com.inspect.system.base.domain.SysUser">