Skip to content

Commit d225d0d

Browse files
committed
fix(Three-way synchronization): The serial number following the organization and user should be changed to id.
1 parent 2b4f7d3 commit d225d0d

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

frontend/src/views/system/user/SyncUserDing.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@
3535
default-expand-all
3636
:expand-on-click-node="false"
3737
>
38-
<template #default="{ node }">
38+
<template #default="{ node, data }">
3939
<div class="custom-tree-node flex">
4040
<el-icon size="28">
41-
<avatar_personal v-if="node.isLeaf"></avatar_personal>
42-
<avatar_organize v-else></avatar_organize>
41+
<avatar_organize v-if="Array.isArray(data.children)"></avatar_organize>
42+
<avatar_personal v-else></avatar_personal>
4343
</el-icon>
4444
<span class="ml-8 ellipsis" style="max-width: 40%" :title="node.label">
4545
{{ node.label }}</span
4646
>
47-
<span class="account ellipsis ml-8" style="max-width: 40%" :title="node.account"
48-
>({{ node.id }})</span
47+
<span class="account ellipsis ml-8" style="max-width: 40%" :title="data.id"
48+
>({{ data.id }})</span
4949
>
5050
</div>
5151
</template>
@@ -73,7 +73,7 @@
7373
class="flex-between align-center hover-bg_select"
7474
>
7575
<div
76-
:title="`${ele.name}(${ele.account})`"
76+
:title="`${ele.name}(${ele.id})`"
7777
class="flex align-center ellipsis"
7878
style="width: 100%"
7979
>
@@ -83,8 +83,8 @@
8383
<span class="ml-8 lighter ellipsis" style="max-width: 40%" :title="ele.name">{{
8484
ele.name
8585
}}</span>
86-
<span class="account ellipsis ml-8" style="max-width: 40%" :title="ele.account"
87-
>({{ ele.account }})</span
86+
<span class="account ellipsis ml-8" style="max-width: 40%" :title="ele.id"
87+
>({{ ele.id }})</span
8888
>
8989
</div>
9090
<el-button class="close-btn" text>
@@ -160,7 +160,7 @@ const filterNode: FilterNodeMethodFunction = (value: string, data: any) => {
160160
}
161161
162162
function isLeafNode(node: any) {
163-
return !node.children || node.children.length === 0
163+
return !Array.isArray(node.children)
164164
}
165165
166166
const handleCheck = () => {

0 commit comments

Comments
 (0)