Merge pull request #1928 from jumpserver/pr@dev@ticket_default_org

fix: ticket del global org
This commit is contained in:
feng626
2022-07-14 15:14:50 +08:00
committed by GitHub
2 changed files with 12 additions and 4 deletions

View File

@@ -122,7 +122,9 @@ export default {
component: Select2,
el: {
multiple: false,
options: this.$store.state.users.workbenchOrgs?.map((item) => {
options: this.$store.state.users.workbenchOrgs.filter(item => {
return item.id !== '00000000-0000-0000-0000-000000000000'
})?.map((item) => {
return { label: item.name, value: item.id }
})
},
@@ -156,7 +158,9 @@ export default {
},
computed: {
...mapState({
workbenchOrgs: state => state.users.workbenchOrgs
workbenchOrgs: state => state.users.workbenchOrgs.filter(item => {
return item.id !== '00000000-0000-0000-0000-000000000000'
})
}),
...mapGetters(['currentOrg'])
},

View File

@@ -100,7 +100,9 @@ export default {
component: Select2,
el: {
multiple: false,
options: this.$store.state.users.workbenchOrgs?.map((item) => {
options: this.$store.state.users.workbenchOrgs.filter(item => {
return item.id !== '00000000-0000-0000-0000-000000000000'
})?.map((item) => {
return { label: item.name, value: item.id }
})
},
@@ -130,7 +132,9 @@ export default {
},
computed: {
...mapState({
workbenchOrgs: state => state.users.workbenchOrgs
workbenchOrgs: state => state.users.workbenchOrgs.filter(item => {
return item.id !== '00000000-0000-0000-0000-000000000000'
})
}),
...mapGetters(['currentOrg'])
},