diff --git a/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java b/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java
index f3199bf..b9d0d70 100644
--- a/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java
+++ b/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java
@@ -3,6 +3,7 @@
 package com.gaotao.modules.sys.controller;
 
 import com.gaotao.common.constant.SysMsgConstant;
+import com.gaotao.common.utils.Constant;
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.sys.entity.SysUserEntity;
 import com.gaotao.modules.sys.form.SysLoginForm;
@@ -110,8 +111,8 @@ public class SysLoginController extends AbstractController {
 			return R.error(getLanguageMsg(SysMsgConstant.OBJECT_ID_200208));
 		}
 	}
-	// 检查用户是否已登录 - rqrq
-	if(sysUserTokenService.isUserLoggedIn(user.getUserId())){
+	// 检查用户是否已登录（超级管理员跳过检查）- rqrq
+	if(user.getUserId() != Constant.SUPER_ADMIN && sysUserTokenService.isUserLoggedIn(user.getUserId())){
 		return R.error("用户已经登录，请先退出后再登录");
 	}
 	session.setAttribute("user", user);
diff --git a/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java b/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java
index 5d39583..30c0b46 100644
--- a/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java
@@ -15,8 +15,8 @@ import java.util.Date;
 
 @Service("sysUserTokenService")
 public class SysUserTokenServiceImpl extends ServiceImpl<SysUserTokenDao, SysUserTokenEntity> implements SysUserTokenService {
-	//12小时后过期
-	private final static int EXPIRE = 3600 * 12;
+	//8小时后过期 - rqrq
+	private final static int EXPIRE = 3600 * 8;
 
 
 	@Override