From 5db70e0719160534c70d7f49a37af04ca325208f Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Sun, 1 May 2022 01:20:18 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=9F=20=E7=94=A8=E6=88=B7=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kicc-ui/src/views/system/user/DeptTree.vue  | 2 +-
 kicc-ui/src/views/system/user/UserModal.vue | 6 +++++-
 kicc-ui/src/views/system/user/index.vue     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/kicc-ui/src/views/system/user/DeptTree.vue b/kicc-ui/src/views/system/user/DeptTree.vue
index 41c7f291..dab0f8a3 100644
--- a/kicc-ui/src/views/system/user/DeptTree.vue
+++ b/kicc-ui/src/views/system/user/DeptTree.vue
@@ -5,7 +5,7 @@
                search
                :clickRowToExpand="false"
                :treeData="treeData"
-               :replaceFields="{ key: 'id', title: 'name' }"
+               :replaceFields="{ key: 'deptId', title: 'name' }"
                @select="handleSelect"
     />
   </div>
diff --git a/kicc-ui/src/views/system/user/UserModal.vue b/kicc-ui/src/views/system/user/UserModal.vue
index 0c990d91..2ac44825 100644
--- a/kicc-ui/src/views/system/user/UserModal.vue
+++ b/kicc-ui/src/views/system/user/UserModal.vue
@@ -21,7 +21,10 @@
   import { listToTree } from "/@/utils/helper/treeHelper";
   import { ModalProps } from "/@/components/Modal";
   import { findListNameById } from '/@/utils';
-  import {TreeItem} from "/@/components/Tree";
+  import { TreeItem } from "/@/components/Tree";
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const { createMessage } = useMessage();
 
   export default defineComponent({
     name: 'UserModal',
@@ -80,6 +83,7 @@
           const formData = await validate();
           setModalProps({ confirmLoading: true });
           formData.deptName = findListNameById(formData.deptId, toRaw(state.deptTree), { idField: 'deptId' });
+          if (!formData.deptName) return createMessage.error('部门名称数据为空,请重试!');
           switch (state.tag) {
             case 'add':
               await addUser(formData);
diff --git a/kicc-ui/src/views/system/user/index.vue b/kicc-ui/src/views/system/user/index.vue
index 758b7c65..88ef2f89 100644
--- a/kicc-ui/src/views/system/user/index.vue
+++ b/kicc-ui/src/views/system/user/index.vue
@@ -30,7 +30,7 @@
         <TableAction :actions="[
           {
             label: '重置密码',
-            icon: 'brandico:codepen',
+            icon: 'fa6-brands:battle-net',
             auth: ['user_reset'],
             onClick: handleResetPassword.bind(null, record),
           },