diff --git a/package-lock.json b/package-lock.json
index 78895cacc8ea6a2172630eb0f7d4fa6dd803492e..cf12e1890c81923dfca05f5a2d5bbf65992fc921 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "zvms-electron",
-  "version": "1.2.0",
+  "version": "1.2.1.20211113",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d6204bc85cee6e021e798a6d10206d818a688921..17ac88bf0e89e5340724f7fb5a1d4bf5c98d2148 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zvms-electron",
-  "version": "1.2.1",
+  "version": "1.2.1.20211113",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/src/App.vue b/src/App.vue
index 879145555108638bc078508d7d650f19703039a3..f566bf20d910cba909abae7e270348018c423ddc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -52,7 +52,7 @@
           </v-list-item-avatar>
           <v-list-item-content>
             <v-list-item-title>义工管理系统</v-list-item-title>
-            <v-list-item-subtitle>v1.2.1</v-list-item-subtitle>
+            <v-list-item-subtitle>v1.2.2</v-list-item-subtitle>
           </v-list-item-content>
         </v-list-item>
         <v-divider></v-divider>
@@ -123,6 +123,8 @@
 </style>
 <script>
 import zutils from "./utils/zutils.js"
+import dialogs from "./utils/dialogs.js";
+import permissions from "./utils/permissions.js";
 
 let { ipcRenderer } = window.require('electron')
 export default {
@@ -131,24 +133,56 @@ export default {
     activeBtn: 1,
     drawer: true,
     phone: false,
-    vol: undefined
+    currentVol: undefined
   }),
   mounted: async function () {
     await zutils.fetchAllVolunter((volworks) => { this.vol = volworks; });
-    setInterval(this.listen, 30000, this);
-	console.log("mounted");
+    setInterval(this.listen, 300000, this);
+      console.log("mounted");
   },
   methods: {
+    granted: function () {
+      return this.$store.state.info.permission < permissions.teacher;
+    },
     changeColorTheme() {
       this.$vuetify.theme.dark = !this.$vuetify.theme.dark;
     },
+    fetchVol: function () {
+       if (this.granted()) this.fetchCurrentClassVol();
+       else this.fetchAllVol();
+    },
+    async fetchCurrentClassVol() {
+      this.$store.commit("loading", true);
+      await zutils.fetchClassVolunter(
+        this.$store.state.info.class,
+        (volworks) => {
+          volworks
+            ? (this.currentVol = volworks)
+            : dialogs.toasts.error("获取义工列表失败");
+        }
+      );
+      this.$store.commit("loading", false);
+    },
+    async fetchAllVol() {
+      this.$store.commit("loading", true);
+      await zutils.fetchAllVolunter((volworks) => {
+        volworks
+          ? (this.currentVol = volworks)
+          : dialogs.toasts.error("获取义工列表失败");
+      });
+      this.$store.commit("loading", false);
+    },
     async listen(t) {
       console.log("listen");
+      if (!t.$store.isLogined){
+        ipcRenderer.send('flash');
+        return;
+      }
       zutils.checkToken(t);
-      let vol;
-      await zutils.fetchAllVolunter((volworks) => { vol = volworks; });
+      await zutils.fetchVol();
       let flag = false;
-      let last = t.vol;
+      let last = t.$store.lastSeenVol;
+      let vol = t.currentVol;
       if (last && vol) {
         if (vol.length != last.length) flag = true;
         else {
diff --git a/src/utils/store.js b/src/utils/store.js
index 9820abc9008155a44d3f2866070e0f74433af359..8799ff5357142f3cae5632ef65feae845b4fecbc 100644
--- a/src/utils/store.js
+++ b/src/utils/store.js
@@ -16,6 +16,7 @@ export default new Vuex.Store({
             class: undefined,
             classname: undefined
         },
+        lastSeenVol: undefined,
         draweritems: [
             { title: '登录', to: '/login', icon: 'mdi-account-circle' },
             { title: "反馈错误", to: "/report", icon: "mdi-alert" }
diff --git a/src/views/volunteer/create.vue b/src/views/volunteer/create.vue
index a997427b6f71aec576a0550c0fbd9bb99a8b166d..4dd2064d054bfc435bb1b3e8a265554d0686d786 100644
--- a/src/views/volunteer/create.vue
+++ b/src/views/volunteer/create.vue
@@ -240,7 +240,7 @@ export default {
             this.form.inside != parseInt(this.form.inside) || isNaN(parseInt(this.form.inside)) || parseInt(this.form.inside) < 0 ||
             this.form.outside != parseInt(this.form.outside) || isNaN(parseInt(this.form.outside)) || parseInt(this.form.outside) < 0 ||
             this.form.large != parseInt(this.form.large) || isNaN(parseInt(this.form.large)) || parseInt(this.form.large) < 0) ||
-             (parseInt(this.form.large) == 0 && parseInt(this.form.outside) == 0 && parseInt(this.form.inside) == 0) {
+             (parseInt(this.form.large) == 0 && parseInt(this.form.outside) == 0 && parseInt(this.form.inside) == 0)) {
                 dialogs.toasts.error("数据不合法");
                 return;
             }
diff --git a/src/views/volunteer/list.vue b/src/views/volunteer/list.vue
index 7650253938665b95fab7a889d4bb2b67c744774a..30841fdeaf718963276f700a659129e97f03f99d 100644
--- a/src/views/volunteer/list.vue
+++ b/src/views/volunteer/list.vue
@@ -143,15 +143,15 @@ export default {
     ],
     volworks: [],
     dialog: false,
-      dialog_participant: false,
+    dialog_participant: false,
     dialog1: false,
-      submitThoughtDialog: false,
+    submitThoughtDialog: false,
     volid: undefined,
     onlyDisplayCurrentClass: true,
     stulst: undefined,
     stulstSelected: [],
     stu_new: undefined,
-      participantsLst: [],
+    participantsLst: [],
     stu: undefined,
     thought: undefined,
     mp: {}
@@ -166,7 +166,8 @@ export default {
     async pageload() {
       await zutils.checkToken(this);
       ipcRenderer.send('endflash');
-      this.switchDisplay();
+      await this.fetchVol();
+      this.$store.lastSeenVol = this.volworks;
     },
     granted: function () {
       return this.$store.state.info.permission < permissions.teacher;
@@ -241,7 +242,7 @@ export default {
       this.volid = volid;
       this.dialog = true;
     },
-    switchDisplay: function () {
+    fetchVol: function () {
        if (this.granted()) this.fetchCurrentClassVol();
        else this.fetchAllVol();
     },