From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回

---
 src/main/java/org/springblade/modules/auth/utils/TokenUtil.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
index a8b2eeb..c39c355 100644
--- a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
+++ b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
@@ -26,6 +26,7 @@
 import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.*;
+import org.springblade.modules.system.entity.Role;
 import org.springblade.modules.system.entity.Tenant;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.entity.UserInfo;
@@ -49,6 +50,7 @@
 	public final static String DEFAULT_TENANT_ID = "000000";
 	public final static String USER_TYPE_HEADER_KEY = "User-Type";
 	public final static String DEFAULT_USER_TYPE = "web";
+	public final static String USER_TYPE_WX = "wx";
 	public final static String USER_NOT_FOUND = "用户名或密码错误";
 	public final static String USER_HAS_NO_ROLE = "未获得用户的角色信息";
 	public final static String USER_HAS_NO_TENANT = "未获得用户的租户信息";
@@ -94,8 +96,11 @@
 		param.put(TokenConstant.NICK_NAME, user.getRealName());
 		param.put(TokenConstant.ROLE_NAME, Func.join(userInfo.getRoles()));
 		param.put(TokenConstant.DETAIL, userInfo.getDetail());
-		param.put("jurisdiction", user.getJurisdiction());
-		param.put("cardid", user.getCardid());
+//		param.put("jurisdiction", user.getJurisdiction());
+//		param.put("cardid", user.getCardid());
+//		param.put("Id", user.getId());
+//		param.put("rname", userInfo.getRoles());
+//		param.put("list", user);
 
 		//拼装accessToken
 		try {
@@ -108,6 +113,11 @@
 				.set(TokenConstant.ROLE_ID, user.getRoleId())
 				.set("jurisdiction", user.getJurisdiction())
 				.set("cardid", user.getCardid())
+				.set("Id", user.getId())
+				.set("rname", userInfo.getRoles())
+				.set("list", user)
+				//是否持证
+				.set("hold",user.getHold())
 				.set(TokenConstant.OAUTH_ID, userInfo.getOauthId())
 				.set(TokenConstant.ACCOUNT, user.getAccount())
 				.set(TokenConstant.USER_NAME, user.getAccount())

--
Gitblit v1.9.3