From 72610ab1948bf57e0073a0dd377ab84393459ca0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 18 六月 2024 18:44:27 +0800
Subject: [PATCH] update 优化 三方登录不同域名获取不到租户id问题

---
 src/api/system/user/types.ts |  103 +++++++++++++++++++++++++--------------------------
 1 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts
index 997b6d4..3488e9f 100644
--- a/src/api/system/user/types.ts
+++ b/src/api/system/user/types.ts
@@ -1,4 +1,3 @@
-import { DeptVO } from './../dept/types';
 import { RoleVO } from '@/api/system/role/types';
 import { PostVO } from '@/api/system/post/types';
 
@@ -6,79 +5,79 @@
  * 鐢ㄦ埛淇℃伅
  */
 export interface UserInfo {
-	user: UserVO;
-	roles: string[];
-	permissions: string[];
+  user: UserVO;
+  roles: string[];
+  permissions: string[];
 }
 
 /**
  * 鐢ㄦ埛鏌ヨ瀵硅薄绫诲瀷
  */
 export interface UserQuery extends PageQuery {
-	userName?: string;
-	phonenumber?: string;
-	status?: string;
-	deptId?: string | number;
-	roleId?: string | number;
+  userName?: string;
+  phonenumber?: string;
+  status?: string;
+  deptId?: string | number;
+  roleId?: string | number;
 }
 
 /**
  * 鐢ㄦ埛杩斿洖瀵硅薄
  */
 export interface UserVO extends BaseEntity {
-	userId: string | number;
-	deptId: number;
-	userName: string;
-	nickName: string;
-	userType: string;
-	email: string;
-	phonenumber: string;
-	sex: string;
-	avatar: string;
-	status: string;
-	delFlag: string;
-	loginIp: string;
-	loginDate: string;
-	remark: string;
-	dept: DeptVO;
-	roles: RoleVO[];
-	roleIds: any;
-	postIds: any;
-	roleId: any;
-	admin: boolean;
+  userId: string | number;
+  deptId: number;
+  userName: string;
+  nickName: string;
+  userType: string;
+  email: string;
+  phonenumber: string;
+  sex: string;
+  avatar: string;
+  status: string;
+  delFlag: string;
+  loginIp: string;
+  loginDate: string;
+  remark: string;
+  deptName: string;
+  roles: RoleVO[];
+  roleIds: any;
+  postIds: any;
+  roleId: any;
+  admin: boolean;
 }
 
 /**
  * 鐢ㄦ埛琛ㄥ崟绫诲瀷
  */
 export interface UserForm {
-	id?: string;
-	userId?: string;
-	deptId?: number;
-	userName: string;
-	nickName?: string;
-	password: string;
-	phonenumber?: string;
-	email?: string;
-	sex?: string;
-	status: string;
-	remark?: string;
-	postIds: string[];
-	roleIds: string[];
+  id?: string;
+  userId?: string;
+  deptId?: number;
+  userName: string;
+  nickName?: string;
+  password: string;
+  phonenumber?: string;
+  email?: string;
+  sex?: string;
+  status: string;
+  remark?: string;
+  postIds: string[];
+  roleIds: string[];
 }
 
 export interface UserInfoVO {
-	user: UserVO;
-	roles: RoleVO[];
-	roleIds: string[];
-	posts: PostVO[];
-	postIds: string[];
-	roleGroup: string;
-	postGroup: string;
+  user: UserVO;
+  roles: RoleVO[];
+  roleIds: string[];
+  posts: PostVO[];
+  postIds: string[];
+  roleGroup: string;
+  postGroup: string;
 }
 
 export interface ResetPwdForm {
-	oldPassword: string;
-	newPassword: string;
-	confirmPassword: string;
+  oldPassword: string;
+  newPassword: string;
+  confirmPassword: string;
 }

--
Gitblit v1.9.3