From 3534b13391b2a6152d0f91b72fda343b13a947cb Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 22 一月 2025 15:55:27 +0800
Subject: [PATCH] 分类码段码值管理查询去除null的情况,分类码段生成编码时去除码值为null的情况

---
 Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetails.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetails.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetails.java
index bc7b230..42e295f 100644
--- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetails.java
+++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/service/BladeUserDetails.java
@@ -40,6 +40,10 @@
 	 */
 	private final String tenantId;
 	/**
+	 * 绉熸埛鍚嶇О
+	 */
+	private String tenantName;
+	/**
 	 * 绗笁鏂硅璇両D
 	 */
 	private final String oauthId;
@@ -60,6 +64,10 @@
 	 */
 	private final String deptId;
 	/**
+	 * 閮ㄩ棬鍚嶇О
+	 */
+	private String deptName;
+	/**
 	 * 宀椾綅id
 	 */
 	private final String postId;
@@ -79,13 +87,23 @@
 	 * 鐢ㄦ埛璇︽儏
 	 */
 	private final Kv detail;
+
+	/**
+	 * 鐢ㄦ埛瀵嗙骇
+	 */
+	private String secretGrade;
+	/**
+	 * 閭欢
+	 */
+	private String email;
+
 	/**
 	 * 瀵嗙爜绛栫暐淇敼鐘舵��
 	 */
 	private Long strategyUpdateStatus;
 
 
-	public BladeUserDetails(Long userId, String tenantId, String oauthId, String name, String realName, String deptId, String postId, String roleId, String roleName, String avatar, String username, String password, Kv detail, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities,Long strategyUpdateStatus) {
+	public BladeUserDetails(Long userId, String tenantId, String oauthId, String name, String realName, String deptId, String postId, String roleId, String roleName, String avatar, String username, String password, Kv detail,String secretGrade, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities,Long strategyUpdateStatus,String tenantName,String deptName,String email) {
 		super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
 		this.userId = userId;
 		this.tenantId = tenantId;
@@ -99,7 +117,11 @@
 		this.roleName = roleName;
 		this.avatar = avatar;
 		this.detail = detail;
+		this.secretGrade = secretGrade;
 		this.strategyUpdateStatus = strategyUpdateStatus;
+		this.tenantName = tenantName;
+		this.deptName = deptName;
+		this.email = email;
 	}
 
 	public BladeUserDetails(Long userId, String tenantId, String oauthId, String name, String realName, String deptId, String postId, String roleId, String roleName, String avatar, String username, String password, Kv detail, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {

--
Gitblit v1.9.3