From 9d2d00bc892bfc2c96ec4992ede74bb1ee12e2de Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 20 Jan 2025 17:31:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E8=BA=AB=E4=BB=BD=E6=97=B6=EF=BC=8C=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=AF=B9=E5=BA=94=E8=BA=AB=E4=BB=BD=E7=9A=84=E6=A1=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeesite/common/shiro/filter/FormFilter.java  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java
index 85d0f4fe..57250659 100644
--- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java
+++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java
@@ -8,6 +8,7 @@ import com.jeesite.common.codec.DesUtils;
 import com.jeesite.common.codec.EncodeUtils;
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.collect.MapUtils;
+import com.jeesite.common.collect.SetUtils;
 import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.ObjectUtils;
 import com.jeesite.common.lang.StringUtils;
@@ -40,6 +41,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 /**
  * 表单验证（包含验证码）过滤类
@@ -454,7 +456,8 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica
 		data.put("year", Global.getProperty("copyrightYear"));
 		data.put("lang", Global.getLang());
 		List<Map<String, Object>> roleList = ListUtils.newArrayList();
-		String desktopUrl = null;
+		String desktopUrl = null; String roleCode = (String)session.getAttribute("roleCode");
+		Set<String> roleCodes = roleCode != null ? SetUtils.newHashSet(StringUtils.splitComma(roleCode)) : null;
 		for (Role role : user.getRoleList()){
 			Map<String, Object> roleMap = MapUtils.newHashMap();
 			roleMap.put("roleCode", role.getRoleCode());
@@ -462,8 +465,15 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica
 			roleMap.put("isShow", role.getIsShow());
 			roleMap.put("sysCodes", role.getSysCodes());
 			roleList.add(roleMap);
-			if (desktopUrl == null && StringUtils.isNotBlank(role.getDesktopUrl())) {
-				desktopUrl = role.getDesktopUrl();
+			// 根据当前身份，选择桌面地址（先得到先受用）
+			if (desktopUrl == null) {
+				if (roleCodes != null){
+					if (roleCodes.contains(role.getRoleCode()) && StringUtils.isNotBlank(role.getDesktopUrl())) {
+						desktopUrl = role.getDesktopUrl();
+					}
+				}else if (StringUtils.isNotBlank(role.getDesktopUrl())) {
+					desktopUrl = role.getDesktopUrl();
+				}
 			}
 		}
 		data.put("roleList", roleList);