From e006fdbfa16bea6456829ddf4db9d120f09df6a4 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 4 Dec 2024 10:54:04 +0800
Subject: [PATCH] *[misc] Resolve json api with sessionid call fail and return
 login page issue.

---
 framework/base/helper.class.php | 4 ++--
 www/index.php                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php
index 0c93c75a4a..9cc60661bb 100644
--- a/framework/base/helper.class.php
+++ b/framework/base/helper.class.php
@@ -849,8 +849,8 @@ class baseHelper
         session_start();
 
         global $app;
-        if($app && isset($_SESSION['user']))  $app->user = $_SESSION['user'];
-        if(!isset($_SESSION['user'])) unset($app->user);
+        if($app &&  isset($_SESSION['user']))  $app->user = $_SESSION['user'];
+        if($app && !isset($_SESSION['user'])) unset($app->user);
     }
 
     /**
diff --git a/www/index.php b/www/index.php
index 17ea22e9e8..0cdc609056 100644
--- a/www/index.php
+++ b/www/index.php
@@ -83,7 +83,7 @@ try
     $common->checkPriv();
     if(!$common->checkIframe()) helper::end();
 
-    if(session_id() != $app->sessionID && strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') === false && strpos($_SERVER['HTTP_USER_AGENT'], 'uni-app') === false) helper::restartSession($app->sessionID);
+    if($app->getViewType() != 'json' && (session_id() != $app->sessionID && strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') === false && strpos($_SERVER['HTTP_USER_AGENT'], 'uni-app') === false)) helper::restartSession($app->sessionID);
 
     $app->loadModule();
 }