From 22904ba421e90d7d8954c2a0e2b16b5f12eeeb9d Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Fri, 5 Mar 2021 13:58:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DDefault=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87ID=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/org.js                                             | 3 ++-
 .../RequestApplicationPermTicketCreateUpdate.vue             | 3 ++-
 .../RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue  | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/utils/org.js b/src/utils/org.js
index d5e14a40e..4e953b7d3 100644
--- a/src/utils/org.js
+++ b/src/utils/org.js
@@ -2,7 +2,7 @@ import { hasUUID, BASE_URL } from '@/utils/common'
 import { getOrgDetail } from '@/api/orgs'
 import store from '@/store'
 
-const DEFAULT_ORG_ID = '00000000-0000-0000-0000-000000000001'
+export const DEFAULT_ORG_ID = '00000000-0000-0000-0000-000000000001'
 // const ROOT_ORG_ID = '00000000-0000-0000-0000-000000000000'
 
 function getPropOrg() {
@@ -59,5 +59,6 @@ async function changeOrg(orgId) {
 export default {
   hasCurrentOrgPermission,
   changeOrg,
+  DEFAULT_ORG_ID,
   change2PropOrg
 }
diff --git a/src/views/tickets/RequestApplicationPerm/RequestApplicationPermTicketCreateUpdate.vue b/src/views/tickets/RequestApplicationPerm/RequestApplicationPermTicketCreateUpdate.vue
index f389e552b..47a630f70 100644
--- a/src/views/tickets/RequestApplicationPerm/RequestApplicationPermTicketCreateUpdate.vue
+++ b/src/views/tickets/RequestApplicationPerm/RequestApplicationPermTicketCreateUpdate.vue
@@ -9,6 +9,7 @@
 <script>
 import { GenericCreateUpdatePage } from '@/layout/components'
 import Select2 from '@/components/Select2'
+import { DEFAULT_ORG_ID } from '@/utils/org'
 import { getDaysFuture } from '@/utils/common'
 import { Required } from '@/components/DataForm/rules'
 export default {
@@ -150,7 +151,7 @@ export default {
             multiple: true,
             value: [],
             ajax: {
-              url: `/api/v1/tickets/assignees/?org_id=DEFAULT`,
+              url: `/api/v1/tickets/assignees/?org_id=${DEFAULT_ORG_ID}`,
               transformOption: (item) => {
                 return { label: item.name + '(' + item.username + ')', value: item.id }
               }
diff --git a/src/views/tickets/RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue b/src/views/tickets/RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue
index 42509186c..f909d0131 100644
--- a/src/views/tickets/RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue
+++ b/src/views/tickets/RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue
@@ -4,6 +4,7 @@
 
 <script>
 import { GenericCreateUpdatePage } from '@/layout/components'
+import { DEFAULT_ORG_ID } from '@/utils/org'
 import Select2 from '@/components/Select2'
 import { getDaysFuture } from '@/utils/common'
 import AssetPermissionFormActionField from '@/views/perms/AssetPermission/components/AssetPermissionFormActionField'
@@ -26,7 +27,7 @@ export default {
           apply_date_start: date_start,
           apply_actions: ['all', 'connect', 'updownload', 'upload_file', 'download_file']
         },
-        org_id: 'DEFAULT',
+        org_id: DEFAULT_ORG_ID,
         type: 'apply_asset'
       },
       fields: [
@@ -76,7 +77,7 @@ export default {
             multiple: true,
             value: [],
             ajax: {
-              url: `/api/v1/tickets/assignees/?org_id=DEFAULT`,
+              url: `/api/v1/tickets/assignees/?org_id=${DEFAULT_ORG_ID}`,
               transformOption: (item) => {
                 return { label: item.name + '(' + item.username + ')', value: item.id }
               }