From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 24 七月 2023 17:29:24 +0800
Subject: [PATCH] 1、修改查询按钮时的条件，使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。
---
Source/BladeX-Tool/blade-starter-auth/src/main/java/org/springblade/core/secure/utils/AuthUtil.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/Source/BladeX-Tool/blade-starter-auth/src/main/java/org/springblade/core/secure/utils/AuthUtil.java b/Source/BladeX-Tool/blade-starter-auth/src/main/java/org/springblade/core/secure/utils/AuthUtil.java
index 04187c4..58d9a9b 100644
--- a/Source/BladeX-Tool/blade-starter-auth/src/main/java/org/springblade/core/secure/utils/AuthUtil.java
+++ b/Source/BladeX-Tool/blade-starter-auth/src/main/java/org/springblade/core/secure/utils/AuthUtil.java
@@ -110,6 +110,10 @@
String roleName = Func.toStr(claims.get(AuthUtil.ROLE_NAME));
String userName = Func.toStr(claims.get(AuthUtil.USER_NAME));
String nickName = Func.toStr(claims.get(AuthUtil.NICK_NAME));
+ String tenantName = Func.toStr(claims.get("tenantName"));
+ String email = Func.toStr(claims.get("email"));
+ String deptName = Func.toStr(claims.get("deptName"));
+ String secretGrade = Func.toStr(claims.get("secretGrade"));
Kv detail = Kv.create().setAll((Map<? extends String, ?>) claims.get(AuthUtil.DETAIL));
BladeUser bladeUser = new BladeUser();
bladeUser.setClientId(clientId);
@@ -123,6 +127,10 @@
bladeUser.setRoleName(roleName);
bladeUser.setUserName(userName);
bladeUser.setNickName(nickName);
+ detail.put("tenantName",tenantName);
+ detail.put("deptName",deptName);
+ detail.put("email",email);
+ detail.put("secretGrade",secretGrade);
bladeUser.setDetail(detail);
return bladeUser;
}
--
Gitblit v1.9.3