From 2b04190ae5c3396c5ee4e3ca73b8546866d6e3a8 Mon Sep 17 00:00:00 2001
From: brooklin <brooklin@tencent.com>
Date: Fri, 1 Sep 2023 11:49:31 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E4=B8=89=E8=A7=92=E6=8C=89=E9=92=AE=E4=BA=8B=E4=BB=B6=20(#1206?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/src/views/organization/index.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/src/views/organization/index.vue b/src/pages/src/views/organization/index.vue
index 074ff9d3c..f8ef0d650 100644
--- a/src/pages/src/views/organization/index.vue
+++ b/src/pages/src/views/organization/index.vue
@@ -11,6 +11,7 @@
           :node-content-action="['selected', 'expand', 'click', 'collapse']"
           :selected="selectedId"
           @node-click="changeNode"
+          @node-expand="changeNode"
         >
           <template #nodeAction="item">
             <span v-if="!item.__attr__.isRoot" style="color: #979ba5;">
@@ -37,6 +38,7 @@
               trigger="click"
               placement="bottom-start"
               ref="dropdownMenu"
+              @click.stop
             >
               <i class="user-icon icon-more"></i>
               <template #content>
@@ -179,6 +181,12 @@ initData();
 
 const changeNode = async (node) => {
   if (state.currentItem.id === node.id) return;
+  state.currentItem = {
+    id: node.id,
+    name: node.name,
+    managers: [],
+  };
+  state.tabLoading = true;
   params.keyword = '';
   if (node.isRoot) {
     panels[1].isVisible = true;
@@ -238,11 +246,6 @@ const getTenantDepartmentsUser = async (id) => {
 
 const getDepartmentsDetails = async (node) => {
   const res = await getTenantDepartments(node.id);
-  state.currentItem = {
-    id: node.id,
-    name: node.name,
-    managers: [],
-  };
   node.children = res.data;
 };
 // 搜索人员信息

From 34c120215e304cb7eb4ee2ae8f57ddd1d89adf6a Mon Sep 17 00:00:00 2001
From: yuri0528 <72436066+yuri0528@users.noreply.github.com>
Date: Mon, 4 Sep 2023 10:14:32 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E8=81=94=E8=B0=83=20(#1208?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/src/css/index.css                   |   2 +-
 src/pages/src/hooks/use-validate.ts           |   2 +-
 src/pages/src/hooks/useMenuInfo.ts            |  15 +-
 src/pages/src/http/dataSourceFiles.ts         |  24 ++-
 src/pages/src/http/organizationFiles.ts       |   9 ++
 src/pages/src/http/types/dataSourceFiles.ts   |  16 +-
 src/pages/src/http/types/organizationFiles.ts |  10 ++
 src/pages/src/router/index.ts                 |  21 ++-
 src/pages/src/views/Header.vue                |   2 +-
 .../src/views/data-source/LocalDataSource.vue |   4 +
 .../data-source/local-details/EditUser.vue    |  99 ++++++++----
 .../data-source/local-details/UserInfo.vue    | 150 ++++++++++++------
 .../data-source/local-details/ViewUser.vue    | 132 ++++++---------
 .../views/data-source/local-details/index.vue |  49 +++++-
 .../organization/details/DetailsInfo.vue      |  12 +-
 .../organization/details/EditDetailsInfo.vue  |  27 +++-
 .../views/organization/details/UserInfo.vue   |  40 +++--
 .../views/organization/details/ViewUser.vue   |  18 ++-
 src/pages/src/views/organization/index.vue    |  88 +++++++---
 src/pages/src/views/organization/tree.less    |   1 +
 src/pages/src/views/personal-center/index.vue |   1 +
 .../src/views/tenant/group-details/index.vue  |   1 +
 22 files changed, 490 insertions(+), 233 deletions(-)

diff --git a/src/pages/src/css/index.css b/src/pages/src/css/index.css
index 693136fe0..528fc7795 100644
--- a/src/pages/src/css/index.css
+++ b/src/pages/src/css/index.css
@@ -52,6 +52,7 @@
 .span-logo {
   display: inline-block;
   width: 16px;
+  margin-right: 8px;
   font-size: 12px;
   font-weight: 700;
   line-height: 16px;
@@ -60,5 +61,4 @@
   background-color: #C4C6CC;
   border-radius: 4px;
   flex-shrink: 0;
-  margin-right: 8px;
 }
diff --git a/src/pages/src/hooks/use-validate.ts b/src/pages/src/hooks/use-validate.ts
index 0cc5af549..728c9cbcb 100644
--- a/src/pages/src/hooks/use-validate.ts
+++ b/src/pages/src/hooks/use-validate.ts
@@ -18,7 +18,7 @@ export default () => {
   };
 
   const userName = {
-    validator: (value: string) => /^([a-zA-Z])([a-zA-Z0-9._-]){0,31}$/.test(value),
+    validator: (value: string) => /^([a-zA-Z0-9])([a-zA-Z0-9._-]){0,31}$/.test(value),
     message: '由1-32位字母、数字、下划线(_)、点(.)、减号(-)字符组成，以字母或数字开头',
     trigger: 'blur',
   };
diff --git a/src/pages/src/hooks/useMenuInfo.ts b/src/pages/src/hooks/useMenuInfo.ts
index 7f182f4a5..1a47df0ee 100644
--- a/src/pages/src/hooks/useMenuInfo.ts
+++ b/src/pages/src/hooks/useMenuInfo.ts
@@ -1,9 +1,10 @@
-import { computed } from 'vue';
+import { computed, inject } from 'vue';
 import { RouteLocationNormalizedLoaded, RouteRecordRaw, useRoute, useRouter } from 'vue-router';
 
 export const useMenuInfo = () => {
   const route = useRoute();
   const router = useRouter();
+  const editLeaveBefore = inject('editLeaveBefore');
 
   // 获取 menu 相关配置
   const { children } = route.matched[0];
@@ -29,6 +30,18 @@ export const useMenuInfo = () => {
     router.push({ name: key });
   };
 
+
+  router.beforeEach(async (to, from, next) => {
+    let enableLeave = true;
+    if (window.changeInput) {
+      enableLeave = await editLeaveBefore();
+    }
+    if (!enableLeave) {
+      return Promise.resolve(enableLeave);
+    }
+    next();
+  });
+
   return {
     activeKey,
     openedKeys,
diff --git a/src/pages/src/http/dataSourceFiles.ts b/src/pages/src/http/dataSourceFiles.ts
index a9c42dd71..9f81ef569 100644
--- a/src/pages/src/http/dataSourceFiles.ts
+++ b/src/pages/src/http/dataSourceFiles.ts
@@ -1,20 +1,36 @@
 import http from './fetch';
 import type {
   DataSourceUsersResult,
-  NewDataSourceUsersParams,
+  NewDataSourceUserParams,
+  PutDataSourceUserParams,
 } from './types/dataSourceFiles';
 
 /**
  * 数据源用户信息列表
  */
-export const getDataSourceUsers = (id: string): Promise<DataSourceUsersResult> => http.get(`/api/v1/web/data-sources/${id}/users/`);
+export const getDataSourceUsers = (id: string, username: string): Promise<DataSourceUsersResult> => http.get(`/api/v1/web/data-sources/${id}/users/?username=${username}`);
 
 /**
  * 新建数据源用户
  */
-export const newDataSourceUsers = (params: NewDataSourceUsersParams) => http.post(`/api/v1/web/data-sources/${params.id}/users/`);
+export const newDataSourceUser = (params: NewDataSourceUserParams) => http.post(`/api/v1/web/data-sources/${params.id}/users/`, params);
 
 /**
  * 数据源创建用户-下拉部门列表
  */
-export const getDataSourceDepartments = (id: string) => http.get(`/api/v1/web/data-sources/${id}/departments/`);
+export const getDataSourceDepartments = (id: string, name: string) => http.get(`/api/v1/web/data-sources/${id}/departments/?name=${name}`);
+
+/**
+ * 数据源创建用户-下拉上级列表
+ */
+export const getDataSourceLeaders = (id: string, keyword: string) => http.get(`/api/v1/web/data-sources/${id}/leaders/?keyword=${keyword}`);
+
+/**
+ * 数据源用户详情
+ */
+export const getDataSourceUserDetails = (id: string) => http.get(`/api/v1/web/data-sources/user/${id}/`);
+
+/**
+ * 更新数据源用户
+ */
+export const putDataSourceUserDetails = (params: PutDataSourceUserParams) => http.put(`/api/v1/web/data-sources/user/${params.id}/`, params);
diff --git a/src/pages/src/http/organizationFiles.ts b/src/pages/src/http/organizationFiles.ts
index 021f39c6e..6dbc8e9a3 100644
--- a/src/pages/src/http/organizationFiles.ts
+++ b/src/pages/src/http/organizationFiles.ts
@@ -1,6 +1,7 @@
 import http from './fetch';
 import type {
   DepartmentsListParams,
+  TenantListParams,
   UpdateTenantParams,
 } from './types/organizationFiles';
 
@@ -39,3 +40,11 @@ export const getTenantDepartmentsList = (params: DepartmentsListParams) => {
   const { id, keyword, page, pageSize, recursive  } = params;
   return http.get(`/api/v1/web/tenant-organization/departments/${id}/users/?keyword=${keyword}&page=${page}&page_size=${pageSize}&recursive=${recursive}`);
 };
+
+/**
+ * 租户下用户列表
+ */
+export const getTenantUsersList = (params: TenantListParams) => {
+  const { id, keyword, page, pageSize } = params;
+  return http.get(`/api/v1/web/tenant-organization/tenants/${id}/users/?keyword=${keyword}&page=${page}&page_size=${pageSize}`);
+};
diff --git a/src/pages/src/http/types/dataSourceFiles.ts b/src/pages/src/http/types/dataSourceFiles.ts
index bf2c28935..1690affac 100644
--- a/src/pages/src/http/types/dataSourceFiles.ts
+++ b/src/pages/src/http/types/dataSourceFiles.ts
@@ -16,7 +16,7 @@ export interface DataSourceUsersResult {
 /**
  * 新建数据源用户参数
  */
-export interface NewDataSourceUsersParams {
+export interface NewDataSourceUserParams {
   id: string,
   username: string,
   full_name: string,
@@ -27,3 +27,17 @@ export interface NewDataSourceUsersParams {
   department_ids?: [],
   leader_ids?: [],
 }
+
+/**
+ * 更新数据源用户参数
+ */
+export interface PutDataSourceUserParams {
+  id: string,
+  full_name: string,
+  email: string,
+  phone_country_code: string,
+  phone: string,
+  logo?: string,
+  department_ids?: [],
+  leader_ids?: [],
+}
diff --git a/src/pages/src/http/types/organizationFiles.ts b/src/pages/src/http/types/organizationFiles.ts
index 97d03f61b..9a23b2aab 100644
--- a/src/pages/src/http/types/organizationFiles.ts
+++ b/src/pages/src/http/types/organizationFiles.ts
@@ -20,3 +20,13 @@ export interface DepartmentsListParams {
   pageSize: number,
   recursive: boolean,
 }
+
+/**
+ * 租户下用户列表参数
+ */
+export interface TenantListParams {
+  id: string,
+  keyword: string,
+  page: number,
+  pageSize: number,
+}
diff --git a/src/pages/src/router/index.ts b/src/pages/src/router/index.ts
index b3509e7ce..7addebe55 100644
--- a/src/pages/src/router/index.ts
+++ b/src/pages/src/router/index.ts
@@ -41,8 +41,8 @@ export default createRouter({
       ],
     },
     {
-      path: '/datasource',
-      name: 'datasource',
+      path: '/data-source',
+      name: 'dataSource',
       redirect: {
         name: 'local',
       },
@@ -55,8 +55,9 @@ export default createRouter({
           path: '',
           name: '',
           meta: {
-            routeParentName: 'datasource',
+            routeParentName: 'data-source',
             navName: '数据源管理',
+            activeMenu: 'local',
           },
           component: () => import('@/views/data-source/LocalCompany.vue'),
           children: [
@@ -64,8 +65,9 @@ export default createRouter({
               path: 'local',
               name: 'local',
               meta: {
-                routeParentName: 'datasource',
+                routeParentName: 'dataSource',
                 navName: '数据源管理',
+                activeMenu: 'local',
               },
               component: () => import('@/views/data-source/LocalDataSource.vue'),
             },
@@ -73,19 +75,21 @@ export default createRouter({
               path: 'other',
               name: 'other',
               meta: {
-                routeParentName: 'datasource',
+                routeParentName: 'dataSource',
                 navName: '数据源管理',
+                activeMenu: 'local',
               },
               component: () => import('@/views/data-source/OtherDataSource.vue'),
             },
           ],
         },
         {
-          path: 'local-details/:name/:type',
+          path: 'local-details/:name/:type/:id',
           name: 'dataConfDetails',
           meta: {
-            routeParentName: 'datasource',
+            routeParentName: 'dataSource',
             navName: '数据源详情',
+            activeMenu: 'local',
           },
           component: () => import('@/views/data-source/local-details/index.vue'),
         },
@@ -93,8 +97,9 @@ export default createRouter({
           path: 'new-local/:type',
           name: 'newLocal',
           meta: {
-            routeParentName: 'datasource',
+            routeParentName: 'dataSource',
             navName: '新建数据源',
+            activeMenu: 'local',
           },
           component: () => import('@/views/data-source/new-data/NewLocalData.vue'),
         },
diff --git a/src/pages/src/views/Header.vue b/src/pages/src/views/Header.vue
index 0f65b75ac..cad968171 100644
--- a/src/pages/src/views/Header.vue
+++ b/src/pages/src/views/Header.vue
@@ -109,7 +109,7 @@ const headerNav = reactive([
   },
   {
     name: '数据源管理',
-    path: 'datasource',
+    path: 'dataSource',
   },
   {
     name: '租户管理',
diff --git a/src/pages/src/views/data-source/LocalDataSource.vue b/src/pages/src/views/data-source/LocalDataSource.vue
index 05388ac91..2b02a37f4 100644
--- a/src/pages/src/views/data-source/LocalDataSource.vue
+++ b/src/pages/src/views/data-source/LocalDataSource.vue
@@ -104,6 +104,7 @@ const dropdownList = ref([
 
 const tableData = [
   {
+    id: 2,
     name: '联通子公司正式员工',
     type: 'local',
     status: 'normal',
@@ -111,6 +112,7 @@ const tableData = [
     modified_at: '2022-04-30  22:35:49',
   },
   {
+    id: 7,
     name: '企业内部',
     type: 'local',
     status: 'disabled',
@@ -125,6 +127,7 @@ function handleClick(item) {
     params: {
       name: item.name,
       type: item.type,
+      id: item.id,
     },
   });
 }
@@ -178,6 +181,7 @@ function newDataSource(item) {
     }
 
     .account-status-icon {
+      display: inline-block;
       width: 16px;
       height: 16px;
       margin-right: 5px;
diff --git a/src/pages/src/views/data-source/local-details/EditUser.vue b/src/pages/src/views/data-source/local-details/EditUser.vue
index 6b9aa19ee..f125254cd 100644
--- a/src/pages/src/views/data-source/local-details/EditUser.vue
+++ b/src/pages/src/views/data-source/local-details/EditUser.vue
@@ -16,6 +16,8 @@
         <bk-input
           v-model="formData.username"
           placeholder="数字、下划线(_)、点(.)、减号(-)字符组成，以字母或数字开头"
+          :disabled="isEdit"
+          @focus="handleChange"
         />
       </bk-form-item>
       <bk-form-item
@@ -27,6 +29,7 @@
         <bk-input
           v-model="formData.full_name"
           placeholder="全名可随时修改"
+          @focus="handleChange"
         />
       </bk-form-item>
       <BkUpload
@@ -40,14 +43,14 @@
         @delete="handleDelete"
       />
       <bk-form-item label="邮箱" property="email" required>
-        <bk-input v-model="formData.email" placeholder="请输入" />
+        <bk-input v-model="formData.email" placeholder="请输入" @focus="handleChange" />
       </bk-form-item>
       <bk-form-item label="手机号" property="phone" required>
         <div class="input-text">
           <bk-input
             v-model="formData.phone"
             placeholder="请输入"
-            type="number"
+            @focus="handleChange"
           />
         </div>
       </bk-form-item>
@@ -56,24 +59,30 @@
           <bk-select
             v-model="formData.department_ids"
             filterable
-            :remote-method="remoteFilter"
-            @toggle="handleSelectDepartment">
+            multiple
+            :input-search="false"
+            :remote-method="searchDepartments"
+            @change="handleChange">
             <bk-option
-              v-for="item in state.departmentList"
-              :key="item.id"
-              :value="item.id"
+              v-for="item in state.departments"
+              :key="Number(item.id)"
+              :value="Number(item.id)"
               :label="item.name" />
           </bk-select>
         </bk-form-item>
         <bk-form-item label="直属上级">
           <bk-select
             v-model="formData.leader_ids"
-            filterable>
+            filterable
+            multiple
+            :input-search="false"
+            :remote-method="searchLeaders"
+            @change="handleChange">
             <bk-option
-              v-for="item in state.leaderList"
-              :key="item.id"
-              :value="item.id"
-              :label="item.name" />
+              v-for="item in state.leaders"
+              :key="Number(item.id)"
+              :value="Number(item.id)"
+              :label="item.username" />
           </bk-select>
         </bk-form-item>
       </div>
@@ -121,7 +130,7 @@
       <bk-button theme="primary" @click="handleSubmit">
         提交
       </bk-button>
-      <bk-button @click="() => $emit('handleCancelEdit')">
+      <bk-button @click="() => emit('handleCancelEdit')">
         取消
       </bk-button>
     </div>
@@ -129,9 +138,10 @@
 </template>
 
 <script setup lang="ts">
-import { computed, reactive, ref } from 'vue';
+import { computed, defineEmits, defineProps, reactive, ref, watch } from 'vue';
 
 import useValidate from '@/hooks/use-validate';
+import { getDataSourceDepartments, getDataSourceLeaders, newDataSourceUser, putDataSourceUserDetails } from '@/http/dataSourceFiles';
 import { getBase64 } from '@/utils';
 
 const props = defineProps({
@@ -143,26 +153,34 @@ const props = defineProps({
     type: Object,
     default: () => ({}),
   },
+  currentId: {
+    type: Number,
+  },
 });
-defineEmits(['handleCancelEdit']);
+const emit = defineEmits(['updateUsers', 'handleCancelEdit']);
 
 const validate = useValidate();
 
 const formRef = ref();
 const formData = reactive({
   ...props.usersData,
+  id: props.currentId,
 });
 const state = reactive({
-  departmentList: [
-    { id: '1', name: '总公司' },
-    { id: '2', name: '分公司' },
-  ],
-  leaderList: [
-    { id: '1', name: 'aa' },
-    { id: '2', name: 'bb' },
-  ],
+  departments: [],
+  leaders: [],
+});
+
+watch(() => props.usersData.departments, (val) => {
+  if (val) {
+    formData.department_ids = props.usersData.departments.map(item => item.id);
+    formData.leader_ids = props.usersData.leaders.map(item => item.id);
+  }
+}, {
+  immediate: true,
 });
 
+const isEdit = computed(() => props.type === 'edit');
 const files = computed(() => {
   const img = [];
   if (formData.logo !== '') {
@@ -173,6 +191,7 @@ const files = computed(() => {
   }
   return [];
 });
+
 const rules = {
   username: [validate.required, validate.userName],
   full_name: [validate.required, validate.name],
@@ -193,22 +212,44 @@ const customRequest = (event) => {
     .catch((e) => {
       console.warn(e);
     });
+  handleChange();
+};
+
+const initData = async () => {
+  const departments = await getDataSourceDepartments(props.currentId, '');
+  const leaders = await getDataSourceLeaders(props.currentId, '');
+  state.departments = departments.data.results;
+  state.leaders = leaders.data.results;
 };
+initData();
 
 const handleDelete = () => {
   formData.logo = '';
+  handleChange();
+};
+
+const handleSubmit = async () => {
+  await formRef.value.validate();
+  const data = { ...formData };
+  if (!data.logo) delete data.logo;
+  props.type === 'edit'
+    ? await putDataSourceUserDetails(data)
+    : await newDataSourceUser(data);
+  emit('updateUsers', '');
 };
 
-const handleSubmit = () => {
-  formRef.value.validate();
+const searchDepartments = async (value: string) => {
+  const departments = await getDataSourceDepartments(props.currentId, value);
+  state.departments = departments.data.results;
 };
 
-const handleSelectDepartment = (value) => {
-  console.log('value', value);
+const searchLeaders = async (value: string) => {
+  const leaders = await getDataSourceLeaders(props.currentId, value);
+  state.leaders = leaders.data.results;
 };
 
-const remoteFilter = (value: string) => {
-  console.log('value', value);
+const handleChange = () => {
+  window.changeInput = true;
 };
 </script>
 
diff --git a/src/pages/src/views/data-source/local-details/UserInfo.vue b/src/pages/src/views/data-source/local-details/UserInfo.vue
index b15b49207..b47ccee19 100644
--- a/src/pages/src/views/data-source/local-details/UserInfo.vue
+++ b/src/pages/src/views/data-source/local-details/UserInfo.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="user-info-wrapper user-scroll-y">
+  <bk-loading :loading="props.isLoading" class="user-info-wrapper user-scroll-y">
     <header>
       <div>
         <bk-button theme="primary" class="mr8" @click="handleClick('add')">
@@ -9,14 +9,30 @@
         <bk-button class="mr8" style="width: 64px;">导入</bk-button>
         <!-- <bk-button>导出</bk-button> -->
       </div>
-      <bk-input class="header-right" v-model="searchVal" type="search" />
+      <bk-input
+        class="header-right"
+        v-model="searchVal"
+        placeholder="搜索公司名、姓名"
+        type="search"
+        clearable
+        @enter="handleEnter"
+        @clear="handleClear" />
     </header>
     <bk-table
       class="user-info-table"
-      :data="tableData"
+      :data="props.users"
       :border="['outer']"
       show-overflow-tooltip
     >
+      <template #empty>
+        <Empty
+          :is-data-empty="props.isDataEmpty"
+          :is-search-empty="props.isEmptySearch"
+          :is-data-error="props.isDataError"
+          @handleEmpty="handleClear"
+          @handleUpdate="handleClear"
+        />
+      </template>
       <bk-table-column prop="username" label="用户名">
         <template #default="{ row }">
           <bk-button text theme="primary" @click="handleClick('view', row)">
@@ -42,12 +58,12 @@
           >
             编辑
           </bk-button>
-          <bk-button theme="primary" text class="mr8">
+          <!-- <bk-button theme="primary" text class="mr8">
             重置密码
           </bk-button>
           <bk-button theme="primary" text>
             删除
-          </bk-button>
+          </bk-button> -->
         </template>
       </bk-table-column>
     </bk-table>
@@ -66,11 +82,11 @@
           <bk-button
             outline
             theme="primary"
-            @click="handleClick('edit', detailsConfig.usersData)">
+            @click="handleClick('edit', detailsConfig)">
             编辑
           </bk-button>
-          <bk-button>重置</bk-button>
-          <bk-button>删除</bk-button>
+          <!-- <bk-button>重置</bk-button>
+          <bk-button>删除</bk-button> -->
         </div>
       </template>
       <template #default>
@@ -79,18 +95,49 @@
           v-else
           :type="detailsConfig.type"
           :users-data="detailsConfig.usersData"
-          @handleCancelEdit="handleCancelEdit" />
+          :current-id="props.currentId"
+          @handleCancelEdit="handleCancelEdit"
+          @updateUsers="updateUsers" />
       </template>
     </bk-sideslider>
-  </div>
+  </bk-loading>
 </template>
 
 <script setup lang="ts">
-import { computed, inject, reactive, ref } from 'vue';
+import { computed, defineEmits, defineProps, inject, reactive, ref, watch } from 'vue';
 
 import EditUser from './EditUser.vue';
 import ViewUser from './ViewUser.vue';
 
+import Empty from '@/components/Empty.vue';
+import { getDataSourceUserDetails } from '@/http/dataSourceFiles';
+
+const props = defineProps({
+  users: {
+    type: Array,
+    default: () => ([]),
+  },
+  isLoading: {
+    type: Boolean,
+    default: false,
+  },
+  currentId: {
+    type: Number,
+  },
+  isDataEmpty: {
+    type: Boolean,
+    default: false,
+  },
+  isEmptySearch: {
+    type: Boolean,
+    default: false,
+  },
+  isDataError: {
+    type: Boolean,
+    default: false,
+  },
+});
+const emit = defineEmits(['updateUsers']);
 const editLeaveBefore = inject('editLeaveBefore');
 const searchVal = ref('');
 const detailsConfig = reactive({
@@ -100,13 +147,14 @@ const detailsConfig = reactive({
   usersData: {
     username: '',
     full_name: '',
-    department_ids: '',
-    leader_ids: '',
+    department_ids: [],
+    leader_ids: [],
     email: '',
     phone_country_code: '+86',
     phone: '',
     logo: '',
   },
+  id: '',
 });
 
 const enumData = {
@@ -124,55 +172,39 @@ const enumData = {
   },
 };
 
-const tableData = [
-  {
-    id: '1',
-    username: 'Loretta Wolfe',
-    full_name: 'Larry Carlson',
-    phone: '13122334455',
-    email: '13122334455@qq.com',
-    departments: [
-      {
-        id: 1,
-        name: 'IEG',
-      },
-      {
-        id: 2,
-        name: '技术运营部',
-      },
-    ],
-  },
-  {
-    id: '2',
-    username: 'Jeanette Stephens',
-    full_name: 'Bettie Ramos',
-    phone: '13122334455',
-    email: '13122334455@qq.com',
-    departments: [
-      {
-        id: 1,
-        name: 'IEG',
-      },
-      {
-        id: 2,
-        name: '技术运营部',
-      },
-    ],
+watch(
+  () => detailsConfig.isShow,
+  () => {
+    if (!detailsConfig.isShow) {
+      detailsConfig.usersData = {
+        username: '',
+        full_name: '',
+        department_ids: [],
+        leader_ids: [],
+        email: '',
+        phone_country_code: '+86',
+        phone: '',
+        logo: '',
+      };
+    }
   },
-];
+);
 
 const isView = computed(() => detailsConfig.type === 'view');
 
-const handleClick = (type: string) => {
-  // if (type !== "add") {
-  //   detailsConfig.usersData = res.data;
-  // }
+const handleClick = async (type: string, item?: any) => {
+  if (type !== 'add') {
+    const res = await getDataSourceUserDetails(item.id);
+    detailsConfig.usersData = res.data;
+    detailsConfig.id = item.id;
+  }
   detailsConfig.title = enumData[type].title;
   detailsConfig.type = enumData[type].type;
   detailsConfig.isShow = true;
 };
 
 const handleCancelEdit = () => {
+  window.changeInput = false;
   if (detailsConfig.type === 'add') {
     detailsConfig.isShow = false;
   } else {
@@ -199,6 +231,20 @@ const formatConvert = (data) => {
   const departments = data?.map(item => item.name).join('/') || '--';
   return departments;
 };
+
+const updateUsers = (value) => {
+  detailsConfig.isShow = false;
+  emit('updateUsers', value);
+};
+
+const handleEnter = () => {
+  emit('updateUsers', searchVal.value);
+};
+
+const handleClear = () => {
+  searchVal.value = '';
+  emit('updateUsers', searchVal.value);
+};
 </script>
 
 <style lang="less" scoped>
diff --git a/src/pages/src/views/data-source/local-details/ViewUser.vue b/src/pages/src/views/data-source/local-details/ViewUser.vue
index 96895bbaa..fe5c5ba98 100644
--- a/src/pages/src/views/data-source/local-details/ViewUser.vue
+++ b/src/pages/src/views/data-source/local-details/ViewUser.vue
@@ -2,97 +2,56 @@
   <ul class="details-content">
     <li>
       <div class="details-content-info">
-        <div
-          class="details-content-item"
-          v-for="(item, index) in basicData"
-          :key="index"
-        >
-          <span class="details-content-key">{{ userMap[item.key] }}：</span>
-          <span class="details-content-value">{{ item.value }}</span>
+        <div class="details-content-item">
+          <span class="details-content-key">用户名：</span>
+          <span class="details-content-value">{{ props.usersData.username }}</span>
+        </div>
+        <div class="details-content-item">
+          <span class="details-content-key">全名：</span>
+          <span class="details-content-value">{{ props.usersData.full_name }}</span>
+        </div>
+        <div class="details-content-item">
+          <span class="details-content-key">邮箱：</span>
+          <span class="details-content-value">{{ props.usersData.email }}</span>
+        </div>
+        <div class="details-content-item">
+          <span class="details-content-key">手机号：</span>
+          <span class="details-content-value">{{ props.usersData.phone }}</span>
+        </div>
+        <div class="details-content-item">
+          <span class="details-content-key">所属组织：</span>
+          <div class="details-content-value" v-if="props.usersData.departments.length > 0">
+            <span v-for="(item, index) in props.usersData.departments" :key="index">
+              {{ item.name}}
+            </span>
+          </div>
+          <span class="details-content-value" v-else>{{ '--' }}</span>
+        </div>
+        <div class="details-content-item">
+          <span class="details-content-key">直属上级：</span>
+          <div class="details-content-value" v-if="props.usersData.leaders.length > 0">
+            <span v-for="(item, index) in props.usersData.leaders" :key="index">
+              {{ item.username }}
+            </span>
+          </div>
+          <span class="details-content-value" v-else>{{ '--' }}</span>
         </div>
       </div>
-      <img
-        v-if="tenantsData.logo"
-        class="user-logo"
-        :src="tenantsData.logo"
-        alt=""
-      />
+      <img v-if="props.usersData.logo" class="user-logo" :src="props.usersData.logo" alt="" />
       <img v-else class="user-logo" src="@/images/avatar.png" alt="" />
     </li>
   </ul>
 </template>
 
 <script setup lang="ts">
-import { reactive } from 'vue';
+import { defineProps } from 'vue';
 
-defineProps({
-  tenantsData: {
+const props = defineProps({
+  usersData: {
     type: Object,
-    default: {},
+    default: () => ({}),
   },
 });
-
-
-const userMap = {
-  user_id: '用户ID',
-  user_name: '用户名',
-  full_name: '全名',
-  email: '邮箱',
-  phone: '手机号',
-  department: '所属组织',
-  leader: '直属上级',
-  status: '在职状态',
-  position: '职务',
-  account_expiration_date: '账号过期时间',
-  password_expiration_date: '密码过期时间',
-};
-
-const basicData = reactive([
-  {
-    key: 'user_id',
-    value: '123',
-  },
-  {
-    key: 'user_name',
-    value: 'aaa',
-  },
-  {
-    key: 'full_name',
-    value: 'bbb',
-  },
-  {
-    key: 'email',
-    value: '124567345@qq.com',
-  },
-  {
-    key: 'phone',
-    value: '15756734555',
-  },
-  {
-    key: 'department',
-    value: '总公司',
-  },
-  {
-    key: 'leader',
-    value: 'Morty Zhang（李三）',
-  },
-  {
-    key: 'status',
-    value: '在职',
-  },
-  {
-    key: 'position',
-    value: '产品经理',
-  },
-  {
-    key: 'account_expiration_date',
-    value: '2023-10-10',
-  },
-  {
-    key: 'password_expiration_date',
-    value: '2023-10-10',
-  },
-]);
 </script>
 
 <style lang="less" scoped>
@@ -125,14 +84,19 @@ const basicData = reactive([
         }
 
         .details-content-value {
-          display: inline-block;
+          display: flex;
           width: calc(100% - 100px);
-          overflow: hidden;
           font-size: 14px;
           color: #313238;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          vertical-align: top;
+          flex-wrap: wrap;
+
+          span {
+            display: inline-block;
+            width: 100%;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
         }
       }
     }
diff --git a/src/pages/src/views/data-source/local-details/index.vue b/src/pages/src/views/data-source/local-details/index.vue
index 5121922d9..8198aa984 100644
--- a/src/pages/src/views/data-source/local-details/index.vue
+++ b/src/pages/src/views/data-source/local-details/index.vue
@@ -21,7 +21,15 @@
         :name="item.name"
         :label="item.label"
       >
-        <UserInfo v-if="activeKey === 'user'" />
+        <UserInfo
+          v-if="activeKey === 'user'"
+          :users="state.users"
+          :is-loading="state.isLoading"
+          :current-id="currentId"
+          :is-data-empty="state.isDataEmpty"
+          :is-empty-search="state.isEmptySearch"
+          :is-data-error="state.isDataError"
+          @updateUsers="updateUsers" />
         <PswInfo v-else />
       </bk-tab-panel>
     </bk-tab>
@@ -36,6 +44,7 @@ import PswInfo from './PswInfo.vue';
 import UserInfo from './UserInfo.vue';
 
 import MainBreadcrumbsDetails from '@/components/layouts/MainBreadcrumbsDetails.vue';
+import { getDataSourceUsers } from '@/http/dataSourceFiles';
 import { dataSourceType } from '@/utils';
 
 const route = useRoute();
@@ -46,12 +55,50 @@ const typeText = computed(() => {
   const { text, icon } = dataSourceType[route.params.type];
   return { text, icon };
 });
+const currentId = computed(() => Number(route.params.id));
 
 const activeKey = ref('user');
 const panels = reactive([
   { name: 'user', label: '用户信息' },
   { name: 'account', label: '账密信息' },
 ]);
+
+const state = reactive({
+  isLoading: false,
+  users: [],
+  departments: [],
+  // 搜索结果为空
+  isEmptySearch: false,
+  // 表格请求出错
+  isDataError: false,
+  // 表格请求结果为空
+  isDataEmpty: false,
+});
+
+const getUsers = async (value?: string) => {
+  try {
+    state.isLoading = true;
+    state.isDataEmpty = false;
+    state.isEmptySearch = false;
+    state.isDataError = false;
+    value = value ? value : '';
+    const res = await getDataSourceUsers(currentId.value, value);
+    if (res.data.length === 0) {
+      value === '' ? state.isDataEmpty = true : state.isEmptySearch = true;
+    }
+    state.users = res.data;
+    state.isLoading = false;
+  } catch (error) {
+    state.isDataError = true;
+  } finally {
+    state.isLoading = false;
+  }
+};
+getUsers();
+
+const updateUsers = (value: string) => {
+  getUsers(value);
+};
 </script>
 
 <style lang="less">
diff --git a/src/pages/src/views/organization/details/DetailsInfo.vue b/src/pages/src/views/organization/details/DetailsInfo.vue
index e62911de1..f4a6ee9c4 100644
--- a/src/pages/src/views/organization/details/DetailsInfo.vue
+++ b/src/pages/src/views/organization/details/DetailsInfo.vue
@@ -4,7 +4,11 @@
       <li class="content-item">
         <div class="item-header">
           <p class="item-title">基本信息</p>
-          <bk-button outline theme="primary" @click="handleClickEdit">
+          <bk-button
+            outline
+            theme="primary"
+            :disabled="!isCurrentTenant"
+            @click="handleClickEdit">
             编辑
           </bk-button>
         </div>
@@ -23,7 +27,7 @@
           </li>
           <li>
             <span class="key">更新时间：</span>
-            <span class="value">--</span>
+            <span class="value">{{ state.userData.updated_at }}</span>
           </li>
           <img v-if="state.userData.logo" :src="state.userData.logo" />
           <img v-else src="@/images/avatar.png" />
@@ -61,7 +65,9 @@ import { computed, reactive, watch } from 'vue';
 import EditInfo from './EditDetailsInfo.vue';
 
 import Empty from '@/components/Empty.vue';
+import { useUser } from '@/store/user';
 
+const userStore = useUser();
 const props = defineProps({
   userData: {
     type: Object,
@@ -79,6 +85,7 @@ const state = reactive({
 });
 
 const userNumberVisible = computed(() => (props?.userData?.feature_flags?.user_number_visible ? '显示' : '隐藏'));
+const isCurrentTenant = computed(() => props?.userData?.id === userStore.user.tenant_id);
 
 watch(() => props.userData.id, () => handleCancel());
 watch(() => props.userData.managers, (value) => {
@@ -104,6 +111,7 @@ const handleClickEdit = () => {
 
 const handleCancel = () => {
   state.isEdit = false;
+  window.changeInput = false;
 };
 
 const updateTenantsList = () => {
diff --git a/src/pages/src/views/organization/details/EditDetailsInfo.vue b/src/pages/src/views/organization/details/EditDetailsInfo.vue
index 8e27a5fcd..5747bdd95 100644
--- a/src/pages/src/views/organization/details/EditDetailsInfo.vue
+++ b/src/pages/src/views/organization/details/EditDetailsInfo.vue
@@ -11,7 +11,7 @@
             :rules="rulesBasicInfo"
           >
             <bk-form-item label="公司名称" property="name" required>
-              <bk-input v-model="formData.name" />
+              <bk-input v-model="formData.name" @focus="handleChange" />
             </bk-form-item>
             <bk-form-item label="公司ID" property="id" required>
               <bk-input
@@ -22,6 +22,7 @@
             <bk-form-item label="人员数量">
               <bk-radio-group
                 v-model="formData.feature_flags.user_number_visible"
+                @change="handleChange"
               >
                 <bk-radio-button :label="true">显示</bk-radio-button>
                 <bk-radio-button :label="false">隐藏</bk-radio-button>
@@ -53,7 +54,7 @@
         </bk-form>
       </div>
     </div>
-    <div class="footer">
+    <div class="footer-box">
       <bk-button theme="primary" @click="handleSubmit">
         提交
       </bk-button>
@@ -65,7 +66,7 @@
 </template>
 
 <script setup lang="tsx">
-import { ref, reactive, computed, watch, nextTick } from "vue";
+import { ref, reactive, computed, nextTick } from "vue";
 import { getBase64 } from "@/utils";
 import MemberSelector from "@/views/tenant/group-details/MemberSelector.vue";
 import { getTenantUsersList } from "@/http/tenantsFiles";
@@ -157,10 +158,12 @@ const customRequest = (event) => {
     .catch((e) => {
       console.warn(e);
     });
+  handleChange();
 };
 
 const handleDelete = () => {
   formData.logo = "";
+  handleChange();
 };
 
 const fieldItemFn = (row: any) => {
@@ -340,8 +343,26 @@ function putTenantOrganization() {
       console.warn(e);
     });
 }
+
+const handleChange = () => {
+  window.changeInput = true;
+}
 </script>
 
 <style lang="less" scoped>
 @import url("@/css/tenantEditStyle.less");
+
+.operation-content {
+  padding: 0 !important;
+}
+
+.footer-box {
+  height: 48px;
+  line-height: 48px;
+
+  .bk-button {
+    width: 88px;
+    margin-right: 8px;
+  }
+}
 </style>
diff --git a/src/pages/src/views/organization/details/UserInfo.vue b/src/pages/src/views/organization/details/UserInfo.vue
index 45ae8c9fc..6b00bcf1a 100644
--- a/src/pages/src/views/organization/details/UserInfo.vue
+++ b/src/pages/src/views/organization/details/UserInfo.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="user-info-wrapper user-scroll-y">
-    <header v-if="!props.userData.isRoot">
-      <bk-checkbox v-model="isCurrentUsers" @change="emit('changeUsers', isCurrentUsers)">
+    <header>
+      <bk-checkbox
+        :class="{ 'is-status': isTenant }"
+        v-model="isCurrentUsers"
+        @change="emit('changeUsers', isCurrentUsers ? false : true)">
         仅显示本级用户（<span>{{ props.pagination.count }}</span>）
       </bk-checkbox>
       <bk-input
@@ -17,7 +20,7 @@
     <bk-table
       class="user-info-table"
       remote-pagination
-      :data="state.managers"
+      :data="userList"
       :pagination="props.pagination"
       :border="['outer']"
       show-overflow-tooltip
@@ -28,7 +31,9 @@
         <Empty
           :is-data-empty="props.isDataEmpty"
           :is-search-empty="props.isEmptySearch"
-          @handleEmpty="handleClear" />
+          :is-data-error="props.isDataError"
+          @handleEmpty="handleClear"
+          @handleUpdate="handleClear" />
       </template>
       <bk-table-column prop="username" label="用户名">
         <template #default="{ row }">
@@ -73,7 +78,7 @@
 </template>
 
 <script setup lang="ts">
-import { inject, reactive, ref, watch } from 'vue';
+import { computed, defineEmits, defineProps, inject, reactive, ref } from 'vue';
 
 import ViewUser from './ViewUser.vue';
 
@@ -98,6 +103,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  isDataError: {
+    type: Boolean,
+    default: false,
+  },
   pagination: {
     type: Object,
     default: () => ({}),
@@ -106,9 +115,13 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  isTenant: {
+    type: Boolean,
+    default: false,
+  },
 });
 const emit = defineEmits(['searchUsers', 'changeUsers', 'updatePageLimit', 'updatePageCurrent']);
-const isCurrentUsers = ref(false);
+const isCurrentUsers = ref(true);
 const detailsConfig = reactive({
   isShow: false,
   title: '',
@@ -116,19 +129,10 @@ const detailsConfig = reactive({
 const searchValue = ref(props.keyword);
 
 const state = reactive({
-  managers: [],
   userInfo: {},
 });
 
-watch(() => props.userData.managers, (value) => {
-  if (value.length > 0) {
-    state.managers = props.userData.managers;
-    state.isDataEmpty = false;
-  } else {
-    state.managers = [];
-    state.isDataEmpty = true;
-  }
-});
+const userList = computed(() => props?.userData || []);
 
 const handleClick = async (item: any) => {
   const res = await getTenantUsers(item.id);
@@ -181,6 +185,10 @@ const pageCurrentChange = (current) => {
     align-items: center;
     margin-bottom: 16px;
 
+    .is-status {
+      visibility: hidden;
+    }
+
     .header-right {
       width: 400px;
     }
diff --git a/src/pages/src/views/organization/details/ViewUser.vue b/src/pages/src/views/organization/details/ViewUser.vue
index 940879535..74ce74dbc 100644
--- a/src/pages/src/views/organization/details/ViewUser.vue
+++ b/src/pages/src/views/organization/details/ViewUser.vue
@@ -52,12 +52,14 @@
 </template>
 
 <script setup lang="ts">
+import { defineProps } from 'vue';
+
 import { dateConvert } from '@/utils';
 
-const props = defineProps({
+defineProps({
   userData: {
     type: Object,
-    default: {},
+    default: () => ({}),
   },
 });
 </script>
@@ -93,13 +95,17 @@ const props = defineProps({
         .details-content-value {
           display: flex;
           width: calc(100% - 100px);
-          overflow: hidden;
           font-size: 14px;
           color: #313238;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          vertical-align: top;
           flex-wrap: wrap;
+
+          span {
+            display: inline-block;
+            width: 100%;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
         }
       }
     }
diff --git a/src/pages/src/views/organization/index.vue b/src/pages/src/views/organization/index.vue
index f8ef0d650..683834266 100644
--- a/src/pages/src/views/organization/index.vue
+++ b/src/pages/src/views/organization/index.vue
@@ -58,9 +58,9 @@
     </div>
     <div class="organization-main">
       <header>
-        <img class="img-logo" v-if="state.currentItem.logo" :src="state.currentItem.logo" />
-        <span v-else class="span-logo">{{ convertLogo(state.currentItem.name) }}</span>
-        <span class="name">{{ state.currentItem.name }}</span>
+        <img class="img-logo" v-if="state.currentTenant.logo" :src="state.currentTenant.logo" />
+        <span v-else class="span-logo">{{ convertLogo(state.currentTenant.name) }}</span>
+        <span class="name">{{ state.currentTenant.name }}</span>
       </header>
       <bk-tab
         v-model:active="state.active"
@@ -78,16 +78,21 @@
           <bk-loading :loading="state.tabLoading">
             <UserInfo
               v-if="index === 0"
-              :user-data="state.currentItem"
+              :user-data="state.currentUsers"
               :is-data-empty="state.isDataEmpty"
               :is-empty-search="state.isEmptySearch"
+              :is-data-error="state.isDataError"
               :pagination="state.pagination"
               :keyword="params.keyword"
+              :is-tenant="isTenant"
               @searchUsers="searchUsers"
               @changeUsers="changeUsers"
               @updatePageLimit="updatePageLimit"
               @updatePageCurrent="updatePageCurrent" />
-            <DetailsInfo v-if="index === 1" :user-data="state.currentItem" @updateTenantsList="initData" />
+            <DetailsInfo
+              v-if="index === 1"
+              :user-data="state.currentTenant"
+              @updateTenantsList="initData" />
           </bk-loading>
         </bk-tab-panel>
       </bk-tab>
@@ -98,7 +103,7 @@
 <script setup lang="ts">
 import { overflowTitle } from 'bkui-vue';
 import { DownShape, RightShape } from 'bkui-vue/lib/icon';
-import { computed, reactive, ref } from 'vue';
+import { computed, inject, reactive, ref } from 'vue';
 
 import DetailsInfo from './details/DetailsInfo.vue';
 import UserInfo from './details/UserInfo.vue';
@@ -108,20 +113,25 @@ import {
   getTenantDepartmentsList,
   getTenantOrganizationDetails,
   getTenantOrganizationList,
+  getTenantUsersList,
 } from '@/http/organizationFiles';
 import { copy } from '@/utils';
 
 const vOverflowTitle = overflowTitle;
+const editLeaveBefore = inject('editLeaveBefore');
 
 const treeRef = ref();
 const state = reactive({
   isLoading: false,
   tabLoading: false,
   treeData: [],
+  currentTenant: {},
+  currentUsers: [],
   currentItem: {},
   active: 'user_info',
   isDataEmpty: false,
   isEmptySearch: false,
+  isDataError: false,
   pagination: {
     current: 1,
     count: 0,
@@ -154,6 +164,8 @@ const params = reactive({
 
 const convertLogo = name => name?.charAt(0).toUpperCase();
 
+const isTenant = computed(() => (!!state.currentItem.isRoot));
+
 const initData = async () => {
   try {
     state.isLoading = true;
@@ -162,6 +174,8 @@ const initData = async () => {
     state.treeData.forEach((item, index) => {
       if (index === 0) {
         getTenantDetails(item.id);
+        getTenantUsers(item.id);
+        state.currentItem = item;
       }
       item.isRoot = true;
       item.children = item.departments;
@@ -186,6 +200,13 @@ const changeNode = async (node) => {
     name: node.name,
     managers: [],
   };
+  let enableLeave = true;
+  if (window.changeInput) {
+    enableLeave = await editLeaveBefore();
+  }
+  if (!enableLeave) {
+    return Promise.resolve(enableLeave);
+  }
   state.tabLoading = true;
   params.keyword = '';
   if (node.isRoot) {
@@ -193,6 +214,7 @@ const changeNode = async (node) => {
     state.active = 'user_info';
     // 切换租户
     await getTenantDetails(node.id);
+    await getTenantUsers(node.id);
   } else {
     panels[1].isVisible = false;
     // 切换组织
@@ -211,34 +233,53 @@ const tabChange = (val) => {
   state.active = val;
 };
 
+const getTenantUsers = async (id) => {
+  try {
+    state.tabLoading = true;
+    params.id = id;
+    const data = { ...params };
+    delete data.recursive;
+    state.isDataEmpty = false;
+    state.isEmptySearch = false;
+    state.isDataError = false;
+    const res = await getTenantUsersList(data);
+    if (res.data.count === 0) {
+      params.keyword === '' ? state.isDataEmpty = true : state.isEmptySearch = true;
+    }
+    state.pagination.count = res.data.count;
+    state.currentUsers = res.data.results;
+    state.tabLoading = false;
+  } catch (e) {
+    state.isDataError = true;
+    state.tabLoading = false;
+  } finally {
+    state.tabLoading = false;
+  }
+};
+
 const getTenantDetails = async (id: string) => {
-  state.tabLoading = true;
-  state.isDataEmpty = false;
-  state.isEmptySearch = false;
   const res = await getTenantOrganizationDetails(id);
-  if (res.data.managers.length === 0) {
-    params.keyword === '' ? state.isDataEmpty = true : state.isEmptySearch = true;
-  }
   state.pagination.count = res.data.managers.length;
-  state.currentItem = res.data;
-  state.currentItem.isRoot = true;
-  state.tabLoading = false;
+  state.currentTenant = res.data;
+  state.currentTenant.isRoot = true;
 };
 
 const getTenantDepartmentsUser = async (id) => {
-  state.tabLoading = true;
-  params.id = id;
-  state.isDataEmpty = false;
-  state.isEmptySearch = false;
   try {
+    state.tabLoading = true;
+    params.id = id;
+    state.isDataEmpty = false;
+    state.isEmptySearch = false;
+    state.isDataError = false;
     const res = await getTenantDepartmentsList(params);
     if (res.data.count === 0) {
       params.keyword === '' ? state.isDataEmpty = true : state.isEmptySearch = true;
     }
     state.pagination.count = res.data.count;
-    state.currentItem.managers = res.data.results;
+    state.currentUsers = res.data.results;
+    state.tabLoading = false;
   } catch (e) {
-    console.log(e);
+    state.isDataError = true;
   } finally {
     state.tabLoading = false;
   }
@@ -246,12 +287,13 @@ const getTenantDepartmentsUser = async (id) => {
 
 const getDepartmentsDetails = async (node) => {
   const res = await getTenantDepartments(node.id);
+  state.currentTenant = res.data;
   node.children = res.data;
 };
 // 搜索人员信息
-const searchUsers = async (value: string) => {
+const searchUsers = (value: string) => {
   params.keyword = value;
-  await getTenantDepartmentsUser(state.currentItem.id);
+  state.currentItem.isRoot ? getTenantUsers(state.currentItem.id) : getTenantDepartmentsUser(state.currentItem.id);
 };
 // 仅显示本级用户
 const changeUsers = async (value: boolean) => {
diff --git a/src/pages/src/views/organization/tree.less b/src/pages/src/views/organization/tree.less
index f09ad2406..ab576a2f4 100644
--- a/src/pages/src/views/organization/tree.less
+++ b/src/pages/src/views/organization/tree.less
@@ -1,4 +1,5 @@
 .tree-wrapper {
+  z-index: 999;
   width: 280px;
   height: 100%;
   min-width: 280px;
diff --git a/src/pages/src/views/personal-center/index.vue b/src/pages/src/views/personal-center/index.vue
index 2ac1e2439..3836ec847 100644
--- a/src/pages/src/views/personal-center/index.vue
+++ b/src/pages/src/views/personal-center/index.vue
@@ -271,6 +271,7 @@ handleClickItem(accountList[0], 0);
           cursor: pointer;
 
           img {
+            display: inline-block;
             width: 22px;
             height: 22px;
             vertical-align: middle;
diff --git a/src/pages/src/views/tenant/group-details/index.vue b/src/pages/src/views/tenant/group-details/index.vue
index a278b041d..ca7095942 100644
--- a/src/pages/src/views/tenant/group-details/index.vue
+++ b/src/pages/src/views/tenant/group-details/index.vue
@@ -229,6 +229,7 @@ const handleClick = async (type: string, item?: any) => {
 };
 
 const handleCancelEdit = async () => {
+  window.changeInput = false;
   if (detailsConfig.type === 'add') {
     detailsConfig.isShow = false;
   } else {

From fa9435a2d221e1366bc19f21d5d30d3986be4f09 Mon Sep 17 00:00:00 2001
From: Canway-shiisa <90179140+Canway-shiisa@users.noreply.github.com>
Date: Mon, 4 Sep 2023 19:42:49 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=E6=9B=B4=E6=96=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E7=94=A8=E6=88=B7-LOGO=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=9D=9E=E5=BF=85=E5=A1=AB=20(#1214)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bk-user/bkuser/apis/web/data_source/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bk-user/bkuser/apis/web/data_source/serializers.py b/src/bk-user/bkuser/apis/web/data_source/serializers.py
index bfa9bf323..890ff4528 100644
--- a/src/bk-user/bkuser/apis/web/data_source/serializers.py
+++ b/src/bk-user/bkuser/apis/web/data_source/serializers.py
@@ -154,7 +154,7 @@ class UserUpdateInputSLZ(serializers.Serializer):
     email = serializers.CharField(help_text="邮箱")
     phone_country_code = serializers.CharField(help_text="手机国际区号")
     phone = serializers.CharField(help_text="手机号")
-    logo = serializers.CharField(help_text="用户 Logo", allow_blank=True)
+    logo = serializers.CharField(help_text="用户 Logo", allow_blank=True, required=False, default="")
 
     department_ids = serializers.ListField(help_text="部门ID列表", child=serializers.IntegerField())
     leader_ids = serializers.ListField(help_text="上级ID列表", child=serializers.IntegerField())

From 46969ee1285f31f5b827117111271393afa1f760 Mon Sep 17 00:00:00 2001
From: neronkl <49228807+neronkl@users.noreply.github.com>
Date: Mon, 4 Sep 2023 19:47:30 +0800
Subject: [PATCH 4/4] fix(organization): fix update tenant without updated_at
 (#1212)

---
 src/bk-user/bkuser/apis/web/tenant/serializers.py | 4 +++-
 src/bk-user/bkuser/biz/tenant.py                  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/bk-user/bkuser/apis/web/tenant/serializers.py b/src/bk-user/bkuser/apis/web/tenant/serializers.py
index f4022bbda..218ae1fbd 100644
--- a/src/bk-user/bkuser/apis/web/tenant/serializers.py
+++ b/src/bk-user/bkuser/apis/web/tenant/serializers.py
@@ -100,7 +100,9 @@ def get_data_sources(self, obj: Tenant) -> List[Dict]:
 
 class TenantUpdateInputSLZ(serializers.Serializer):
     name = serializers.CharField(help_text="租户名称")
-    logo = serializers.CharField(help_text="租户 Logo", required=False, default=settings.DEFAULT_TENANT_LOGO)
+    logo = serializers.CharField(
+        help_text="租户 Logo", required=False, allow_blank=True, default=settings.DEFAULT_TENANT_LOGO
+    )
     manager_ids = serializers.ListField(child=serializers.CharField(), help_text="租户用户 ID 列表", allow_empty=False)
     feature_flags = TenantFeatureFlagSLZ(help_text="租户特性集")
 
diff --git a/src/bk-user/bkuser/biz/tenant.py b/src/bk-user/bkuser/biz/tenant.py
index 8e704dfbc..010bc6f6e 100644
--- a/src/bk-user/bkuser/biz/tenant.py
+++ b/src/bk-user/bkuser/biz/tenant.py
@@ -12,6 +12,7 @@
 from typing import Dict, List, Optional
 
 from django.db import transaction
+from django.utils.timezone import now
 from pydantic import BaseModel
 
 from bkuser.apps.data_source.models import (
@@ -307,7 +308,7 @@ def update_with_managers(tenant_id: str, tenant_info: TenantEditableBaseInfo, ma
 
         with transaction.atomic():
             # 更新基本信息
-            Tenant.objects.filter(id=tenant_id).update(**tenant_info.model_dump())
+            Tenant.objects.filter(id=tenant_id).update(updated_at=now(), **tenant_info.model_dump())
 
             if should_deleted_manager_ids:
                 TenantManager.objects.filter(