diff --git a/src/modules/smart-system/components/SysDept/SysDeptTree.vue b/src/modules/smart-system/components/SysDept/SysDeptTree.vue
index c6017fc89..6bceb28b9 100644
--- a/src/modules/smart-system/components/SysDept/SysDeptTree.vue
+++ b/src/modules/smart-system/components/SysDept/SysDeptTree.vue
@@ -97,9 +97,17 @@
         if (async) {
           return unref(dataList);
         }
+        const convertDataList = unref(dataList).map(({ deptId, deptName, deptCode, parentId }) => {
+          return {
+            deptId,
+            deptName,
+            deptCode,
+            parentId,
+          };
+        });
         return (
           TreeUtils.convertList2Tree(
-            dataList.value,
+            convertDataList,
             (item) => item.deptId,
             (item) => item.parentId,
             0,
diff --git a/src/modules/smart-system/views/dept/SysDeptTreeList.vue b/src/modules/smart-system/views/dept/SysDeptTreeList.vue
index 30805a970..aff49f5df 100644
--- a/src/modules/smart-system/views/dept/SysDeptTreeList.vue
+++ b/src/modules/smart-system/views/dept/SysDeptTreeList.vue
@@ -33,7 +33,7 @@
           {{ $t('common.button.delete') }}
         </a-button>
       </div>
-      <sys-dept-tree style="margin-top: 5px" ref="treeRef" show-search @select="handleTreeSelect" />
+      <SysDeptTree style="margin-top: 5px" ref="treeRef" show-search @select="handleTreeSelect" />
     </div>
     <div class="full-height right-tab">
       <a-tabs>
@@ -67,7 +67,7 @@
   import { useModal } from '@/components/Modal';
   import { errorMessage, successMessage } from '@/utils/message/SystemNotice';
 
-  import SysDeptTree from './components/SysDeptTree.vue';
+  import SysDeptTree from '../../components/SysDept/SysDeptTree.vue';
   import SysDeptEdit from './components/SysDeptEdit.vue';
   import SysDeptEditModal from './components/SysDeptEditModal.vue';
   import { deleteApi, saveUpdateBatchApi } from './SysDept.api';
diff --git a/src/modules/smart-system/views/dept/components/SysDeptEdit.vue b/src/modules/smart-system/views/dept/components/SysDeptEdit.vue
index 4d18519f5..0e9c53497 100644
--- a/src/modules/smart-system/views/dept/components/SysDeptEdit.vue
+++ b/src/modules/smart-system/views/dept/components/SysDeptEdit.vue
@@ -8,7 +8,7 @@
   import type { FormSchema } from '@/components/Form';
   import { Spin } from 'ant-design-vue';
 
-  import { ref, watch } from 'vue';
+  import { nextTick, ref, watch } from 'vue';
   import { useForm, BasicForm } from '@/components/Form';
   import { propTypes } from '@/utils/propTypes';
   import { useI18n } from '@/hooks/web/useI18n';
@@ -28,23 +28,25 @@
 
   watch(
     () => props.deptId,
-    async (value) => {
-      if (!value) {
-        await resetFields();
-      } else {
-        try {
-          getLoading.value = true;
-          const deptData = await getByIdApi(value);
-          if (deptData.parentDept) {
-            deptData.parentName = deptData.parentDept.deptName;
-          } else {
-            deptData.parentName = '根';
+    (value) => {
+      nextTick(async () => {
+        if (!value) {
+          resetFields();
+        } else {
+          try {
+            getLoading.value = true;
+            const deptData = await getByIdApi(value);
+            if (deptData.parentDept) {
+              deptData.parentName = deptData.parentDept.deptName;
+            } else {
+              deptData.parentName = '根';
+            }
+            setFieldsValue(deptData);
+          } finally {
+            getLoading.value = false;
           }
-          await setFieldsValue(deptData);
-        } finally {
-          getLoading.value = false;
         }
-      }
+      });
     },
   );
 
diff --git a/src/modules/smart-system/views/dept/components/SysDeptTree.vue b/src/modules/smart-system/views/dept/components/SysDeptTree.vue
deleted file mode 100644
index 5d7bafde2..000000000
--- a/src/modules/smart-system/views/dept/components/SysDeptTree.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
-  <div>
-    <div v-if="showSearch" class="search-container">
-      <a-input-search
-        v-model:value="searchValue"
-        :placeholder="$t('system.views.dept.search.deptName')"
-      />
-    </div>
-    <Spin :spinning="loading">
-      <a-tree
-        v-bind="getAttrs"
-        :expanded-keys="expandedKeys"
-        :auto-expand-parent="autoExpandParent"
-        @expand="onExpand"
-        :field-names="fieldNames"
-        :tree-data="computedTreeData"
-      >
-        <template #title="{ deptName }">
-          <span v-if="!showSearch">
-            {{ deptName }}
-          </span>
-          <span v-else-if="deptName.indexOf(searchValue) > -1">
-            {{ deptName.substr(0, deptName.indexOf(searchValue)) }}
-            <span style="color: #f50">{{ searchValue }}</span>
-            {{ deptName.substr(deptName.indexOf(searchValue) + searchValue.length) }}
-          </span>
-          <span v-else>{{ deptName }}</span>
-        </template>
-      </a-tree>
-    </Spin>
-  </div>
-</template>
-
-<script lang="ts">
-  import { computed, defineComponent, onMounted, reactive, ref, toRefs, unref, watch } from 'vue';
-
-  import { Spin } from 'ant-design-vue';
-  import { errorMessage } from '@/utils/message/SystemNotice';
-  import TreeUtils from '@/utils/TreeUtils';
-  import { propTypes } from '@/utils/propTypes';
-  import { ApiServiceEnum, defHttp } from '@/utils/http/axios';
-
-  const getParentKey = (key: number, treeData: Array<any>): number => {
-    let parentKey;
-    for (let i = 0; i < treeData.length; i++) {
-      const node = treeData[i];
-      if (node.children) {
-        if (node.children.some((item: any) => item.deptId === key)) {
-          parentKey = node.deptId;
-        } else {
-          const secondParentKey = getParentKey(key, node.children);
-          if (secondParentKey) {
-            parentKey = secondParentKey;
-          }
-        }
-      }
-    }
-    return parentKey;
-  };
-
-  export default defineComponent({
-    name: 'SysDeptTree',
-    components: { Spin },
-    props: {
-      // 是否支持搜索
-      showSearch: propTypes.bool.def(true),
-      // 是否异步加载
-      async: propTypes.bool,
-    },
-    setup(props, { attrs }) {
-      const { async: asyncRef } = toRefs(props);
-      const searchValue = ref<string>('');
-
-      const dataList = ref<Array<any>>([]);
-      const autoExpandParent = ref(false);
-      const expandedKeys = ref<Array<number>>([]);
-      const loading = ref(false);
-
-      const getAttrs = computed(() => {
-        const result: any = {
-          ...attrs,
-        };
-        if (unref(asyncRef)) {
-          result.loadData = handleAsyncLoadData;
-        }
-        return result;
-      });
-
-      /**
-       * 树形数据计算属性
-       */
-      const computedTreeData = computed(() => {
-        const async = unref(asyncRef);
-        if (async) {
-          return unref(dataList);
-        }
-        return (
-          TreeUtils.convertList2Tree(
-            dataList.value,
-            (item) => item.deptId,
-            (item) => item.parentId,
-            0,
-          ) || []
-        );
-      });
-
-      const onExpand = (keys: Array<number>) => {
-        expandedKeys.value = keys;
-        autoExpandParent.value = false;
-      };
-
-      /**
-       * 所有数据
-       */
-      const getAllDataList = computed(() => {
-        const result: any[] = [];
-        if (unref(asyncRef)) {
-          recursionAddChildren(unref(dataList), result);
-        } else {
-          result.push(...unref(dataList));
-        }
-        return result;
-      });
-
-      const recursionAddChildren = (list: any[], allData: any[]) => {
-        list.forEach((item) => {
-          allData.push(item);
-          if (item.children && item.children.length > 0) {
-            recursionAddChildren(item.children, allData);
-          }
-        });
-      };
-
-      watch(searchValue, (value) => {
-        const allData = unref(getAllDataList);
-        expandedKeys.value = allData
-          .map(({ deptName, deptId }: any) => {
-            if (deptName.indexOf(value) > -1) {
-              return getParentKey(deptId, computedTreeData.value);
-            }
-            return null;
-          })
-          .filter((item, i, self) => item && self.indexOf(item) === i) as Array<number>;
-        autoExpandParent.value = true;
-      });
-
-      const handleAsyncLoadData = async (treeNode) => {
-        const dataRef = treeNode.dataRef;
-        dataRef.children = await loadData(dataRef.deptId);
-        dataList.value = [...unref(dataList)];
-      };
-
-      const reload = () => loadData();
-
-      /**
-       * 加载数据函数
-       */
-      const loadData = async (parentId?: number | null) => {
-        const parameter: Recordable = {
-          sortName: 'seq',
-          sortOrder: 'asc',
-        };
-        if (parentId !== undefined && parentId !== null) {
-          parameter.parameter = {
-            'parentId@=': parentId,
-          };
-        }
-        try {
-          loading.value = true;
-          const result = (await defHttp.post({
-            service: ApiServiceEnum.SMART_SYSTEM,
-            url: 'sys/dept/list',
-            data: parameter,
-          })) as any[];
-
-          result.forEach((item) => {
-            if (item.hasChild !== true) {
-              item.isLeaf = true;
-            }
-          });
-          if (unref(asyncRef)) {
-            if (parentId === 0) {
-              dataList.value = result;
-            } else {
-              return result;
-            }
-          } else {
-            dataList.value = result;
-          }
-        } catch (e) {
-          errorMessage(e);
-        } finally {
-          loading.value = false;
-        }
-      };
-
-      /**
-       * 加载数据
-       */
-      onMounted(() => {
-        let parentId: number | undefined = undefined;
-        if (unref(asyncRef)) {
-          parentId = 0;
-        }
-        loadData(parentId);
-      });
-
-      return {
-        computedTreeData,
-        autoExpandParent,
-        onExpand,
-        loadData,
-        loading,
-        expandedKeys,
-        fieldNames: reactive({
-          children: 'children',
-          title: 'deptName',
-          key: 'deptId',
-        }),
-        getAttrs,
-        handleAsyncLoadData,
-        searchValue,
-        reload,
-      };
-    },
-  });
-</script>
-
-<style scoped lang="less">
-  .search-container {
-    margin-bottom: 10px;
-  }
-</style>