diff --git a/src/views/activity/edit.vue b/src/views/activity/edit.vue
index 1a3e7bb..0fb64a6 100644
--- a/src/views/activity/edit.vue
+++ b/src/views/activity/edit.vue
@@ -483,14 +483,15 @@ export default class extends Vue {
     this.initTimes()
     const id = this.$route.params?.id
     await this.getRemoteCategory()
+    if (id) {
+      await this.fetchData(id)
+    }
     if (UserModule.level === 1) {
       await this.getRemoteDeptList()
     } else {
       this.postForm.shop = UserModule.department
     }
-    if (id) {
-      await this.fetchData(id)
-    }
+
     this.tempTagView = Object.assign({}, this.$route)
   }
 
@@ -639,9 +640,7 @@ export default class extends Vue {
 
     if (this.postForm.qtypes?.length > 0) {
       this.typeSelected = this.postForm.qtypes
-      return
-    }
-    if (this.postForm.shop) {
+    } else if (this.postForm.shop) {
       let currentShop
       for (const p of this.allDepts) {
         if (p._id === this.postForm.shop) {
@@ -654,8 +653,8 @@ export default class extends Vue {
       } else {
         this.typeSelected = []
       }
-      this.$refs.typeTree.setCheckedKeys(this.typeSelected)
     }
+    this.$refs.typeTree.setCheckedKeys(this.typeSelected)
   }
 
   // begin of set puzzle types