diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/PostRole.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/PostRole.java
index e05b75b7..d91f1228 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/PostRole.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/PostRole.java
@@ -20,10 +20,11 @@ import com.jeesite.common.mybatis.annotation.Table;
 	},
 	joinTable={
 		@JoinTable(type=JoinTable.Type.LEFT_JOIN, entity=Role.class, alias="r", lazy = true,
-			on="a.role_code = r.role_code AND r.status = ${STATUS_NORMAL}", attrName="role",
+			on="a.role_code = r.role_code", attrName="role",
 			columns={
 				@Column(name="role_code", attrName="roleCode", label="角色编码", isPK=true),
 				@Column(name="role_name", attrName="roleName", label="角色名称"),
+				@Column(name="status", attrName="status", label="角色状态"),
 			})
 	}, orderBy=""
 )
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
index bb03798a..ec023f55 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
@@ -374,6 +374,9 @@ public class LoginController extends BaseController{
 		}else{
 			session.removeAttribute("sysCode");
 		}
+		// 切换系统时，清除当前岗位和角色状态
+		session.removeAttribute("postCode");
+		session.removeAttribute("roleCode");
 		UserUtils.removeCache(UserUtils.CACHE_AUTH_INFO+"_"+session.getId());
 		if (ServletUtils.isAjaxRequest(request)) {
 			return renderResult(Global.TRUE, text("子系统切换成功"));