From ce567eb11cd0cdbd826214c355d1a8caff175dca Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 15 十一月 2023 14:25:22 +0800
Subject: [PATCH] bug列表:181(修复新增,修改,删除接口,新增时没设置默认值,导致在建分类时无法查询到,关键属性查重规则)183(历史数据导入模板下载,过滤掉模板中配置的默认属性)

---
 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