fix：修复三方登录异常;同步三方aollowIp设为*;对null值做处理

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);
     }
 

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位小数（四舍五入）

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">