diff --git a/src/views/assets/Domain/DomainDetail/AssetList.vue b/src/views/assets/Domain/DomainDetail/AssetList.vue
index 26628cdf2..b11d2cf59 100644
--- a/src/views/assets/Domain/DomainDetail/AssetList.vue
+++ b/src/views/assets/Domain/DomainDetail/AssetList.vue
@@ -110,6 +110,7 @@ export default {
       }).then(() => {
         this.$axios.patch(`/api/v1/assets/assets/`, patch_data).then(() => {
           this.reloadTable()
+          this.$message.success(this.$t('common.RemoveSuccessMsg'))
         })
       }).catch(() => {
       })
diff --git a/src/views/assets/Domain/DomainDetail/GatewayList.vue b/src/views/assets/Domain/DomainDetail/GatewayList.vue
index a20414ff7..ff20732df 100644
--- a/src/views/assets/Domain/DomainDetail/GatewayList.vue
+++ b/src/views/assets/Domain/DomainDetail/GatewayList.vue
@@ -214,6 +214,7 @@ export default {
       }).then(() => {
         this.$axios.patch(`/api/v1/assets/gateways/`, patch_data).then(() => {
           this.reloadTable()
+          this.$message.success(this.$t('common.RemoveSuccessMsg'))
         })
       }).catch(() => {
       })
diff --git a/src/views/assets/Domain/components/AddAssetDialog.vue b/src/views/assets/Domain/components/AddAssetDialog.vue
index 976d76927..cfe85e54e 100644
--- a/src/views/assets/Domain/components/AddAssetDialog.vue
+++ b/src/views/assets/Domain/components/AddAssetDialog.vue
@@ -43,13 +43,13 @@ export default {
   data() {
     return {
       formConfig: {
-        url: `/api/v1/assets/assets/?domain=${this.$route.params.id}&exclude_platform=Gateway`,
         getUrl: () => {
-          return `/api/v1/assets/assets/`
+          return '/api/v1/assets/assets/'
         },
         submitMethod: () => 'patch',
         hasReset: false,
         hasSaveContinue: false,
+        needGetObjectDetail: false,
         createSuccessMsg: this.$t('common.AddSuccessMsg'),
         updateSuccessNextRoute: {
           name: 'DomainDetail',
@@ -68,7 +68,7 @@ export default {
                 domain_enabled: true
               },
               canSelect: (row) => {
-                return row.platform?.name !== 'Gateway'
+                return row.platform?.name !== 'Gateway' && this.object.assets.map(item => item.id).indexOf(row.id) === -1
               }
             }
           }
diff --git a/src/views/assets/Domain/components/AddGatewayDialog.vue b/src/views/assets/Domain/components/AddGatewayDialog.vue
index 03737b9ca..1d5523b37 100644
--- a/src/views/assets/Domain/components/AddGatewayDialog.vue
+++ b/src/views/assets/Domain/components/AddGatewayDialog.vue
@@ -43,14 +43,18 @@ export default {
   data() {
     return {
       formConfig: {
-        url: `/api/v1/assets/assets/?domain=${this.$route.params.id}&platform=Gateway`,
         getUrl: () => {
-          return `/api/v1/assets/domains/${this.$route.params.id}/`
+          return '/api/v1/assets/assets/'
         },
         submitMethod: () => 'patch',
         hasReset: false,
         hasSaveContinue: false,
+        needGetObjectDetail: false,
         createSuccessMsg: this.$t('common.AddSuccessMsg'),
+        updateSuccessNextRoute: {
+          name: 'DomainDetail',
+          params: { id: this.$route.params.id }
+        },
         fields: ['gateways'],
         fieldsMeta: {
           gateways: {
@@ -60,9 +64,18 @@ export default {
               clearable: true,
               ajax: {
                 url: '/api/v1/assets/assets/?domain_enabled=true&platform=Gateway'
-              }
+              },
+              disabledValues: this.object.gateways.map(item => item.id)
             }
           }
+        },
+        cleanFormValue(values) {
+          const data = []
+          values.gateways.forEach(item => {
+            const d = { id: item.pk, domain: this.$route.params.id }
+            data.push(d)
+          })
+          return data
         }
       }
     }