fix: 修复职务显示问题 TencentBlueKing#820

yuri0528 · Dec 5, 2022 · 666d159 · 666d159
1 parent 110006d
commit 666d159
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/pages/src/views/organization/details/UserMaterial.vue b/src/pages/src/views/organization/details/UserMaterial.vue
@@ -223,7 +223,7 @@ export default {
       this.activeFieldsList.forEach((item) => {
         if (item.options.length > 0) {
           item.options.map((key) => {
-            if (key.id === this.currentProfile[item.key]) {
+            if (key.id === this.currentProfile[item.key] || key.id === Number(this.currentProfile[item.key])) {
               item.value = key.value;
             }
           });

diff --git a/src/pages/src/views/organization/index.vue b/src/pages/src/views/organization/index.vue
@@ -557,6 +557,7 @@ export default {
           this.filterTreeData(catalog, this.treeDataList);
           catalog.children = catalog.departments;
           catalog.children.forEach((department) => {
+            this.$set(department, 'category_id', catalog.id);
             this.filterTreeData(department, catalog, catalog.type === 'local');
           });
         });

diff --git a/src/pages/src/views/organization/table/UserTable.vue b/src/pages/src/views/organization/table/UserTable.vue
@@ -263,7 +263,7 @@ export default {
             return '';
           }
           for (let i = 0; i < options.length; i++) {
-            if (options[i].id === value) {
+            if (options[i].id === value || options[i].id === Number(value)) {
               if (this.$i18n.locale === 'en') {
                 return value;
               }