Merge pull request #2681 from lhzzforever/dev/develop_ci

Dev/develop ci
TencentBlueKing · May 31, 2024 · 26778ad · 26778ad
2 parents e6eb630 + 611ee5d
commit 26778ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
@@ -170,7 +170,7 @@ export const beforeEach = async (to, from, next) => {
   }
 
   if (['applyJoinUserGroup', 'applyCustomPerm', 'myManageSpace', 'myPerm', 'permTransfer', 'permRenewal'].includes(to.name)
-      || (['permRenewal'].includes(to.name) && to.query.source === 'email')) {
+      || (['permRenewal'].includes(to.name) && ['email', 'notification'].includes(to.query.source))) {
     await store.dispatch('role/updateCurrentRole', { id: 0 });
     await store.dispatch('userInfo');
     curRole = 'staff';
@@ -232,7 +232,7 @@ export const beforeEach = async (to, from, next) => {
     }
   } else {
     // 邮件点击续期跳转过来的链接需要做身份的前置判断
-    if (to.name === 'groupPermRenewal' && to.query.source === 'email' && currentRoleId) {
+    if (to.name === 'groupPermRenewal' && ['email', 'notification'].includes(to.query.source) && currentRoleId) {
       await getManagerInfo();
       navDiffMenuIndex(1);
     }

diff --git a/frontend/src/views/perm/group-perm-renewal/index.vue b/frontend/src/views/perm/group-perm-renewal/index.vue
@@ -355,7 +355,7 @@
             id: item.id
           };
           const { current_role_id: currentRoleId, source } = this.$route.query;
-          if (currentRoleId && source === 'email') {
+          if (currentRoleId && ['email', 'notification'].includes(source)) {
             params.hidden = false;
           }
           const { data } = await this.$store.dispatch('renewal/getExpireSoonGroupMembers', params);
@@ -390,7 +390,7 @@
             expire_soon: true
           };
           const { current_role_id: currentRoleId, source } = this.$route.query;
-          if (currentRoleId && source === 'email') {
+          if (currentRoleId && ['email', 'notification'].includes(source)) {
             params.hidden = false;
           }
           const { data } = await this.$store.dispatch('memberTemplate/getGroupSubjectTemplate', params);
@@ -419,7 +419,7 @@
             offset: this.pagination.limit * (this.pagination.current - 1)
           };
           const { current_role_id: currentRoleId, source } = this.$route.query;
-          if (currentRoleId && source === 'email') {
+          if (currentRoleId && ['email', 'notification'].includes(source)) {
             params.hidden = false;
           }
           const { code, data } = await this.$store.dispatch('renewal/getExpiredGroups', params);
@@ -631,7 +631,7 @@
               : checkList.map(({ id, type }) => ({ id, type }))
           };
           const { current_role_id: currentRoleId, source } = this.$route.query;
-          if (currentRoleId && source === 'email') {
+          if (currentRoleId && ['email', 'notification'].includes(source)) {
             params.hidden = false;
           }
           const { code } = await this.$store.dispatch('userGroup/deleteUserGroupMember', params);
@@ -836,7 +836,7 @@
           }))
         };
         const { current_role_id: currentRoleId, source } = this.$route.query;
-        if (currentRoleId && source === 'email') {
+        if (currentRoleId && ['email', 'notification'].includes(source)) {
           params.hidden = false;
         }
         console.log(params, '参数');