Merge remote-tracking branch 'origin/dev' into dev

src/main/h5/src/router/index.js

@@ -97,7 +97,10 @@ router.beforeEach((to, from, next) => {
       .dispatch("getUserInfo")
       .then(() => {
         if (to.name === "inspectorList") {
-          if (store.state.role === "ROLE_EXPERT") {
+          if (
+            store.state.role === "ROLE_EXPERT" ||
+            store.state.role === "ROLE_DISTRICT_STAFF"
+          ) {
             next("/expertList");
           } else {
             next();
@@ -113,7 +116,10 @@ router.beforeEach((to, from, next) => {
   } else if (store.state.userInfo && to.name === "inspectorList") {
     if (store.state.role === "ROLE_SUPERVISOR") {
       next();
-    } else if (store.state.role === "ROLE_EXPERT") {
+    } else if (
+      store.state.role === "ROLE_EXPERT" ||
+      store.state.role === "ROLE_DISTRICT_STAFF"
+    ) {
       next("/expertList");
     }
   } else if (!to.matched.length) {