diff --git a/frontend/src/components/nav/index.vue b/frontend/src/components/nav/index.vue
index 8dd95be5c..8d784183a 100644
--- a/frontend/src/components/nav/index.vue
+++ b/frontend/src/components/nav/index.vue
@@ -500,7 +500,6 @@
         this.selectCls = 'hide-iam-nav-select-cls';
         if (value) {
           this.selectCls = 'iam-nav-select-dropdown-content';
-          this.handleClearSearch();
           this.resetPagination();
           this.resetSubPagination();
           await this.resetRoleList('handleClearSearch');
@@ -573,6 +572,9 @@
       // 刷新一、二级管理员列表和设置当前页捕获不到的数据
       async resetRoleList (payload) {
         const { role } = this.user;
+        if (payload === 'handleClearSearch') {
+          this[payload]();
+        }
         if (this.$refs.selectTree) {
           const curNode = this.$refs.selectTree.getNodeById(role.id);
           if (!curNode && this.$refs.select && this.isSearch) {
@@ -586,9 +588,6 @@
           if (curNode && curNode.data && curNode.data.has_subset_manager) {
             await this.handleExpandNode(curNode || this.curRoleData);
           }
-          if (payload === 'handleClearSearch') {
-            this[payload]();
-          }
         }
       },
       
diff --git a/frontend/src/components/render-perm/index.vue b/frontend/src/components/render-perm/index.vue
index 3267695c9..2eb0eb659 100644
--- a/frontend/src/components/render-perm/index.vue
+++ b/frontend/src/components/render-perm/index.vue
@@ -103,7 +103,7 @@
       handleExpanded () {
         this.isExpanded = !this.isExpanded;
         this.$emit('update:expanded', true);
-        this.$emit('on-expanded', true);
+        this.$emit('on-expanded', this.isExpanded);
       }
     }
   };
diff --git a/frontend/src/language/lang/en.js b/frontend/src/language/lang/en.js
index f7ddf6237..869d0c747 100644
--- a/frontend/src/language/lang/en.js
+++ b/frontend/src/language/lang/en.js
@@ -102,6 +102,7 @@ export const m = {
         '加入时间': 'Joined at',
         '成员': 'member',
         '位成员': 'member(s)',
+        '个人员模板': 'member templates',
         '设置新用户加入': 'Set up new users to join',
         '用户组的有效期': 'The expiration date of the group',
         '设置新用户加入用户组的有效期': 'Set the expiration date for new users joining the group {value}',
@@ -417,6 +418,9 @@ export const m = {
         '这些成员将不再继承该组的权限': 'these members will no longer inherit the permissions of the group',
         '该组将不再继承该模板的权限': 'The group will no longer inherit the permissions of the template',
         '这些成员将不再关联该用户组的权限': 'These members will no longer be associated with the permissions of this user group',
+        '相关人员将不再关联该用户组的权限': 'The relevant members will no longer be associated with the permissions of this user group',
+        '人员模板关联的该用户组将不再存在续期': 'The user group associated with the member template will no longer have renewals',
+        '这些人员模板关联的该用户组将不再存在续期': 'The user group associated with these member templates will no longer have renewals',
         '解除成功': 'Lifted',
         '当前用户将不再继承该模板权限': 'The current user will no longer inherit the template permissions',
         '退出成功': 'Quit successfully',
@@ -1086,8 +1090,7 @@ export const m = {
         '暂无将过期的权限': 'No permission will expire',
         '续期申请提交成功': 'Renewal application submitted',
         '续期成功': 'Renewal successful',
-        '即将过期的用户/组织': 'Expiring Users/Organizations',
-        '请选择即将过期的用户/组织': 'Please select the user/organization that will expire soon',
+        '请选择用户/组织或人员模板': 'Please select user/organization or member templates',
         '该成员在该用户组将不再存在续期': 'This member will no longer have a renewal in this user group',
         '这些成员在该用户组将不再存在续期': 'These members will no longer have renewals in this user group',
         '没有需要续期的权限': 'No permission to renew',
diff --git a/frontend/src/language/lang/zh.js b/frontend/src/language/lang/zh.js
index e6369b1cb..81ae54553 100644
--- a/frontend/src/language/lang/zh.js
+++ b/frontend/src/language/lang/zh.js
@@ -101,6 +101,7 @@ export const m = {
         '加入时间': '加入时间',
         '成员': '成员',
         '位成员': '位成员',
+        '个人员模板': '个人员模板',
         '设置新用户加入': '设置新用户加入',
         '用户组的有效期': '用户组的有效期',
         '当前版本': '当前版本',
@@ -417,6 +418,9 @@ export const m = {
         '这些成员将不再继承该组的权限': '这些成员将不再继承该组的权限',
         '该组将不再继承该模板的权限': '该组将不再继承该模板的权限',
         '这些成员将不再关联该用户组的权限': '这些成员将不再关联该用户组的权限',
+        '相关人员将不再关联该用户组的权限': '相关人员将不再关联该用户组的权限',
+        '人员模板关联的该用户组将不再存在续期': '人员模板关联的该用户组将不再存在续期',
+        '这些人员模板关联的该用户组将不再存在续期': '这些人员模板关联的该用户组将不再存在续期',
         '解除成功': '解除成功',
         '当前用户将不再继承该模板权限': '当前用户将不再继承该模板权限',
         '退出成功': '退出成功',
@@ -1086,8 +1090,7 @@ export const m = {
         '暂无将过期的权限': '暂无将过期的权限',
         '续期申请提交成功': '续期申请提交成功',
         '续期成功': '续期成功',
-        '即将过期的用户/组织': '即将过期的用户/组织',
-        '请选择即将过期的用户/组织': '请选择即将过期的用户/组织',
+        '请选择用户/组织或人员模板': '请选择用户/组织或人员模板',
         '该成员在该用户组将不再存在续期': '该成员在该用户组将不再存在续期',
         '这些成员在该用户组将不再存在续期': '这些成员在该用户组将不再存在续期',
         '没有需要续期的权限': '没有需要续期的权限',
diff --git a/frontend/src/views/group/components/attribute.vue b/frontend/src/views/group/components/attribute.vue
index c5a7a9641..93774c54e 100644
--- a/frontend/src/views/group/components/attribute.vue
+++ b/frontend/src/views/group/components/attribute.vue
@@ -302,7 +302,7 @@
           // this.attrValueListMap[this.curOperateData.id].shift();
           return;
         }
-        if (event.target.scrollTop + event.target.offsetHeight >= event.target.scrollHeight) {
+        if (event.target.scrollTop + event.target.offsetHeight >= event.target.scrollHeight - 1) {
           ++this.pagination.current;
           if (this.pagination.current <= this.pagination.totalPage) {
             await this.fetchResourceAttrValues(this.curOperateData, this.curKeyWord, false, true);
diff --git a/frontend/src/views/group/components/iam-add-member.vue b/frontend/src/views/group/components/iam-add-member.vue
index 846b3c96a..04a2acb72 100644
--- a/frontend/src/views/group/components/iam-add-member.vue
+++ b/frontend/src/views/group/components/iam-add-member.vue
@@ -1033,7 +1033,7 @@
           const keyword = getUsername(manualInputValue[i]);
           const params = {
             keyword,
-            is_exact: true
+            is_exact: false
           };
           try {
             if (manualInputValue.length < 10) {
diff --git a/frontend/src/views/group/components/member-table.vue b/frontend/src/views/group/components/member-table.vue
index e7dfc0b84..f6d29bfdb 100644
--- a/frontend/src/views/group/components/member-table.vue
+++ b/frontend/src/views/group/components/member-table.vue
@@ -1309,8 +1309,8 @@
           if (this.curModeMap[this.curRouteMode]) {
             this.deleteDialog.subTitle = `${this.$t(`m.common['移除']`)} ${
               this.currentSelectList.length
-            } ${this.$t(`m.common['位成员']`)}${this.$t(`m.common['，']`)}${this.$t(
-              `m.info['这些成员将不再关联该用户组的权限']`
+            } ${this.$t(`m.common['个人员模板']`)}${this.$t(`m.common['，']`)}${this.$t(
+              `m.info['相关人员将不再关联该用户组的权限']`
             )}${this.$t(`m.common['。']`)}`;
           } else {
             this.deleteDialog.subTitle = `${this.$t(`m.common['移除']`)} ${
diff --git a/frontend/src/views/manage-spaces/components/add-action-side-slider.vue b/frontend/src/views/manage-spaces/components/add-action-side-slider.vue
index b0bbc4b3e..ac67da423 100644
--- a/frontend/src/views/manage-spaces/components/add-action-side-slider.vue
+++ b/frontend/src/views/manage-spaces/components/add-action-side-slider.vue
@@ -634,9 +634,7 @@
             item.sub_groups = [];
           }
           let allChecked = true;
-          if (['myManageSpaceCreate'].includes(this.$route.name)
-            && (['gradingAdminCreate'].includes(this.$route.name) && ['staff'].includes(this.user.role.type))
-          ) {
+          if (['myManageSpaceCreate', 'authorBoundaryEditFirstLevel'].includes(this.$route.name)) {
             item.actions = item.actions.filter(v => !v.hidden);
           }
           item.actions.forEach(act => {
@@ -654,9 +652,7 @@
             this.linearAction.push(act);
           });
           item.sub_groups.forEach(act => {
-            if (['myManageSpaceCreate'].includes(this.$route.name)
-              && (['gradingAdminCreate'].includes(this.$route.name) && ['staff'].includes(this.user.role.type))
-            ) {
+            if (['myManageSpaceCreate', 'authorBoundaryEditFirstLevel'].includes(this.$route.name)) {
               act.actions = act.actions.filter(v => !v.hidden);
             }
             (act.actions || []).forEach(v => {
diff --git a/frontend/src/views/manage-spaces/components/render-instance-table.vue b/frontend/src/views/manage-spaces/components/render-instance-table.vue
index ca8b2db08..171d3ad9f 100644
--- a/frontend/src/views/manage-spaces/components/render-instance-table.vue
+++ b/frontend/src/views/manage-spaces/components/render-instance-table.vue
@@ -442,20 +442,14 @@
       handleActionLinearData () {
         const linearActions = [];
         this.curSystemActions.forEach((item) => {
-          if (['myManageSpaceCreate'].includes(this.$route.name)
-            && (['gradingAdminCreate'].includes(this.$route.name)
-              && ['staff'].includes(this.user.role.type))
-          ) {
+          if (['myManageSpaceCreate', 'authorBoundaryEditFirstLevel'].includes(this.$route.name)) {
             item.actions = item.actions.filter(v => !v.hidden);
           }
           item.actions.forEach(act => {
             linearActions.push(act);
           });
           (item.sub_groups || []).forEach(sub => {
-            if (['myManageSpaceCreate'].includes(this.$route.name)
-              && (['gradingAdminCreate'].includes(this.$route.name)
-                && ['staff'].includes(this.user.role.type))
-            ) {
+            if (['myManageSpaceCreate', 'authorBoundaryEditFirstLevel'].includes(this.$route.name)) {
               sub.actions = sub.actions.filter(v => !v.hidden);
             }
             sub.actions.forEach(act => {
diff --git a/frontend/src/views/my-manage-space/add-member-boundary/index.vue b/frontend/src/views/my-manage-space/add-member-boundary/index.vue
index 40f9b7add..e9819a201 100644
--- a/frontend/src/views/my-manage-space/add-member-boundary/index.vue
+++ b/frontend/src/views/my-manage-space/add-member-boundary/index.vue
@@ -932,7 +932,7 @@
         for (let i = 0; i < manualInputValue.length; i++) {
           const params = {
             keyword: manualInputValue[i],
-            is_exact: true
+            is_exact: false
           };
           try {
             if (manualInputValue.length < 10) {
diff --git a/frontend/src/views/perm/group-perm-renewal/index.vue b/frontend/src/views/perm/group-perm-renewal/index.vue
index c54088990..5c63ae414 100644
--- a/frontend/src/views/perm/group-perm-renewal/index.vue
+++ b/frontend/src/views/perm/group-perm-renewal/index.vue
@@ -9,7 +9,7 @@
           :ext-cls="index > 0 ? 'group-perm-renewal-ext-cls' : ''"
           :class="index === tableList.length - 1 ? 'group-perm-renewal-cls' : ''"
           :title="item.name"
-          @on-expanded="handleExpanded(...arguments, item)"
+          @on-expanded="handleExpanded(...arguments, item, index)"
         >
           <render-search>
             <bk-button :disabled="formatDisabled(item)" @click="handleBatchDelete(item, index)">
@@ -20,49 +20,133 @@
             class="group-member-renewal-table-wrapper"
             v-bkloading="{ isLoading: item.loading, opacity: 1 }"
           >
-            <bk-table
-              v-if="!item.loading"
-              :data="item.children"
-              size="small"
-              ref="permTableRef"
-              ext-cls="perm-renewal-table"
-              :outer-border="false"
-              :header-border="false"
-              :pagination="item.pagination"
-              @page-change="pageChange(...arguments, item)"
-              @page-limit-change="limitChange(...arguments, item)"
-              @select="handlerChange(...arguments, index)"
-              @select-all="handlerAllChange(...arguments, index)"
-            >
-              <bk-table-column type="selection" align="center" :selectable="getIsSelect" />
-              <bk-table-column :label="$t(`m.renewal['即将过期的用户/组织']`)">
-                <template slot-scope="{ row }">
-                  <span>{{ row.id }}({{ row.name }})</span>
+            <div class="group-renewal-member-wrapper">
+              <bk-tab
+                ref="tabRef"
+                type="unborder-card"
+                ext-cls="group-tab-wrapper"
+                :key="tabKey"
+                :active.sync="item.tabActive"
+                @tab-change="handleTabChange(item, index, ...arguments)"
+              >
+                <bk-tab-panel v-for="panel in item.groupTabList" v-bind="panel" :key="panel.name">
+                  <template slot="label">
+                    <span class="panel-name">{{ panel.label }}</span>
+                    <span
+                      :class="['panel-count', { 'panel-count-active': item.tabActive === panel.name }]"
+                    >
+                      {{ panel.pagination.count }}
+                    </span>
+                  </template>
+                </bk-tab-panel>
+              </bk-tab>
+              <bk-table
+                size="small"
+                ref="permTableRef"
+                ext-cls="perm-renewal-table"
+                :outer-border="false"
+                :header-border="false"
+                :data="getTableList(item)"
+                :data-custom-key="`${item.name}&${item.id}-${index}`"
+                :pagination="formatPagination(item)"
+                @page-change="handleTablePageChange(...arguments, item)"
+                @page-limit-change="handleTableLimitChange(...arguments, item)"
+                @select="handlerChange(...arguments, index)"
+                @select-all="handlerAllChange(...arguments, index)"
+                v-bkloading="{ isLoading: item.tableLoading, opacity: 1 }"
+              >
+                <bk-table-column type="selection" align="center" :selectable="getDefaultSelect" />
+                <template v-for="tableItem in item.tableProps">
+                  <template v-if="tableItem.prop === 'name'">
+                    <bk-table-column
+                      :key="tableItem.prop"
+                      :label="tableItem.label"
+                      :prop="tableItem.prop">
+                      <template slot-scope="{ row }">
+                        <span>{{ row.id }}({{ row.name }})</span>
+                      </template>
+                    </bk-table-column>
+                  </template>
+                  <template v-else-if="tableItem.prop === 'template_name'">
+                    <bk-table-column
+                      :key="tableItem.prop"
+                      :label="tableItem.label"
+                      :prop="tableItem.prop">
+                      <template slot-scope="{ row }">
+                        <div class="member-template" :title="row.name">
+                          <Icon type="renyuanmuban" />
+                          <span class="name">
+                            {{ row.name || "--" }}
+                          </span>
+                        </div>
+                      </template>
+                    </bk-table-column>
+                  </template>
+                  <template
+                    v-else-if="tableItem.prop === 'expired_at_display'"
+                  >
+                    <bk-table-column
+                      :key="tableItem.prop"
+                      :label="tableItem.label"
+                      :prop="tableItem.prop">
+                      <template slot-scope="{ row }">
+                        <render-expire-display
+                          :selected="currentSelectList.map((v) => v.$id).includes(row.$id)"
+                          :renewal-time="expiredAt"
+                          :cur-time="row.expired_at"
+                        />
+                      </template>
+                    </bk-table-column>
+                  </template>
+                  <template v-else-if="tableItem.prop === 'description'">
+                    <bk-table-column
+                      :key="tableItem.prop"
+                      :label="tableItem.label"
+                      :prop="tableItem.prop">
+                      <template slot-scope="{ row }">
+                        <span :title="row.description">
+                          {{ row.description || '--' }}
+                        </span>
+                      </template>
+                    </bk-table-column>
+                  </template>
+                  <template v-else-if="tableItem.prop === 'created_time'">
+                    <bk-table-column
+                      :key="tableItem.prop"
+                      :label="tableItem.label"
+                      :prop="tableItem.prop">
+                      <template slot-scope="{ row }">
+                        <span :title="row.created_time.replace(/T/, ' ')">
+                          {{ row.created_time.replace(/T/, " ") }}
+                        </span>
+                      </template>
+                    </bk-table-column>
+                  </template>
+                  <template v-else-if="tableItem.prop === 'operate'">
+                    <bk-table-column
+                      :key="tableItem.prop"
+                      :label="tableItem.label"
+                      :prop="tableItem.prop"
+                      fixed="right"
+                    >
+                      <template slot-scope="{ row }">
+                        <bk-button theme="primary" text @click.stop="handleDelete(row, index)">
+                          {{ $t(`m.common['删除']`) }}
+                        </bk-button>
+                      </template>
+                    </bk-table-column>
+                  </template>
                 </template>
-              </bk-table-column>
-              <bk-table-column :label="$t(`m.common['有效期']`)">
-                <template slot-scope="{ row }">
-                  <render-expire-display
-                    :selected="currentSelectList.map((v) => v.$id).includes(row.$id)"
-                    :renewal-time="expiredAt"
-                    :cur-time="row.expired_at"
-                  />
+                <template slot="empty">
+                  <ExceptionEmpty />
                 </template>
-              </bk-table-column>
-              <bk-table-column :resizable="false" :label="$t(`m.common['操作']`)">
-                <template slot-scope="{ row }">
-                  <bk-button theme="primary" @click.stop="handleDelete(row, index)" text>
-                    {{ $t(`m.common['删除']`) }}
-                  </bk-button>
-                </template>
-              </bk-table-column>
-            </bk-table>
+              </bk-table>
+            </div>
           </div>
         </render-perm>
       </template>
       <template v-if="tableList.length < 1 && !tableLoading">
         <div class="empty-wrapper">
-          <!-- <img src="@/images/empty-display.svg" alt="" /> -->
           <ExceptionEmpty
             :type="emptyData.type"
             :empty-text="emptyData.text"
@@ -86,10 +170,11 @@
       </bk-pagination>
     </div>
     <p class="error-tips" v-if="isShowErrorTips">
-      {{ $t(`m.renewal['请选择即将过期的用户/组织']`) }}
+      {{ $t(`m.renewal['请选择用户/组织或人员模板']`) }}
     </p>
     <render-horizontal-block :label="$t(`m.renewal['续期时长']`)">
       <iam-deadline :value="expiredAt" @on-change="handleDeadlineChange" />
+      <p class="error-tips expired-at-error" v-if="isShowExpiredError">{{ $t(`m.userOrOrg['请选择续期时长']`) }}</p>
     </render-horizontal-block>
     <div slot="action">
       <bk-button theme="primary" disabled v-if="isEmpty">
@@ -120,14 +205,14 @@
   </smart-action>
 </template>
 <script>
-  import _ from 'lodash';
+  import { cloneDeep } from 'lodash';
   import { mapGetters } from 'vuex';
-  import { PERMANENT_TIMESTAMP, SIX_MONTH_TIMESTAMP, ONE_DAY_TIMESTAMP } from '@/common/constants';
+  import { PERMANENT_TIMESTAMP, SIX_MONTH_TIMESTAMP } from '@/common/constants';
   import IamDeadline from '@/components/iam-deadline/horizontal';
   import renderExpireDisplay from '@/components/render-renewal-dialog/display';
   import renderPerm from '@/components/render-perm';
   import DeleteDialog from '@/views/perm/components/iam-confirm-dialog';
-  import { formatCodeData } from '@/common/util';
+  import { formatCodeData, getNowTimeExpired } from '@/common/util';
 
   export default {
     name: '',
@@ -141,9 +226,10 @@
       return {
         expiredAt: SIX_MONTH_TIMESTAMP,
         submitLoading: false,
-        tableList: [],
         tableLoading: false,
         isShowErrorTips: false,
+        isShowExpiredError: false,
+        tableList: [],
         currentSelectList: [],
         pagination: {
           current: 1,
@@ -151,6 +237,7 @@
           limit: 10
         },
         currentBackup: 1,
+        tableIndex: -1,
         pageLoading: false,
         deleteDialog: {
           visible: false,
@@ -158,25 +245,63 @@
           subTitle: '',
           loading: false
         },
-        tableIndex: -1,
-        curDelMember: {},
+        tableProps: [],
+        groupTabList: [
+          {
+            name: 'userOrgPerm',
+            label: this.$t(`m.userGroup['用户/组织']`),
+            empty: 'emptyOrgData',
+            pagination: {
+              current: 1,
+              limit: 10,
+              count: 0
+            },
+            children: []
+          },
+          {
+            name: 'memberTemplate',
+            label: this.$t(`m.nav['人员模板']`),
+            empty: 'emptyTempData',
+            pagination: {
+              current: 1,
+              limit: 10,
+              count: 0
+            },
+            children: []
+          }
+        ],
         emptyData: {
           type: '',
           text: '',
           tip: '',
           tipType: ''
-        }
+        },
+        curDelMember: {},
+        tabKey: 'tabKey'
       };
     },
     computed: {
       ...mapGetters(['user', 'externalSystemId']),
       isEmpty () {
-          return this.tableList.length < 1;
-      }
-    },
-    watch: {
-      'pagination.current' (value) {
-        this.currentBackup = value;
+        return this.tableList.length < 1;
+      },
+      formatPagination () {
+        return (payload) => {
+          const tabData = payload.groupTabList.find((item) => item.name === payload.tabActive);
+          if (tabData) {
+            return tabData.pagination;
+          }
+          return { current: 1, limit: 10, count: 0 };
+        };
+      },
+      getTableList () {
+        return (payload) => {
+          const tabData = payload.groupTabList.find((item) => item.name === payload.tabActive);
+          if (tabData) {
+            return tabData.children;
+          }
+          return [];
+        };
       }
     },
     methods: {
@@ -186,123 +311,93 @@
       },
 
       async fetchDefaultCheck () {
-        if (this.pagination.current === 1) {
-          for (let i = 0; i < this.tableList.length; i++) {
-            const item = this.tableList[i];
-            this.$set(item, 'expanded', true);
-            this.$set(item, 'checkList', []);
-            await this.fetchMembers(item, i);
-            if (item.children && item.children.length) {
-              item.children.forEach(subItem => {
-                this.currentSelectList.push(subItem);
+        for (let i = 0; i < this.tableList.length; i++) {
+          const item = this.tableList[i];
+          this.$set(item, 'expanded', true);
+          this.$set(item, 'checkList', []);
+          this.$set(item, 'tabActive', 'userOrgPerm');
+          this.$set(item, 'groupTabList', cloneDeep(this.groupTabList));
+          await Promise.all([this.fetchMembers(item), this.fetchGroupSubjectTemplate(item)]).then(() => {
+            if (item.groupTabList && item.groupTabList.length) {
+              const childList = item.groupTabList.map((v) => v.children || []).flat(Infinity);
+              childList && childList.forEach(subItem => {
                 item.checkList.push(subItem);
-                this.$refs.permTableRef
-                  && this.$refs.permTableRef[i].toggleRowSelection(subItem, true);
+                if (this.$refs.permTableRef && this.$refs.permTableRef.length) {
+                  this.$refs.permTableRef[i].toggleRowSelection(subItem, true);
+                }
               });
             }
-          }
-          this.setExpiredAt();
+          });
         }
+        this.currentSelectList = this.tableList.map((item) => item.checkList).flat(Infinity);
       },
 
-      getIsSelect (item, index) {
-        return item.parent.children.length > 0;
-      },
-
-      formatDisabled (payload) {
-        const { checkList, children } = payload;
-        return !(checkList.length && children.length);
-      },
-
-      handleBatchDelete (payload, index) {
-        const { checkList } = payload;
-        const deleteContent = checkList.length === 1
-          ? `${this.$t(`m.common['【']`)}${checkList[0].id}(${checkList[0].name})${this.$t(`m.common['】']`)}${this.$t(`m.common['，']`)}${this.$t(`m.renewal['该成员在该用户组将不再存在续期']`)}`
-          : `${checkList.length} ${this.$t(`m.common['位成员']`)}${this.$t(`m.common['，']`)}${this.$t(`m.renewal['这些成员在该用户组将不再存在续期']`)}`;
-        this.deleteDialog.subTitle = `${this.$t(`m.common['移除']`)}${deleteContent}`;
-        this.tableIndex = index;
-        this.curDelMember = {};
-        this.deleteDialog.visible = true;
-      },
-
-      handleDelete (payload, index) {
-        this.deleteDialog.subTitle = `${this.$t(`m.common['移除']`)}${this.$t(`m.common['【']`)}${payload.id}(${payload.name})${this.$t(`m.common['】']`)}${this.$t(`m.common['，']`)}${this.$t(`m.renewal['该成员在该用户组将不再存在续期']`)}`;
-        this.curDelMember = Object.assign({}, {
-          id: payload.id,
-          type: payload.type
-        });
-        this.tableIndex = index;
-        this.deleteDialog.visible = true;
-      },
-
-      handleAfterDeleteLeave () {
-        this.deleteDialog.subTitle = '';
-        this.curDelMember = {};
-      },
-
-      hideCancelDelete () {
-        this.deleteDialog.visible = false;
-      },
-
-      async handleSubmitDelete () {
-        this.deleteDialog.loading = true;
+      async fetchMembers (item) {
+        const tabData = item.groupTabList.find((v) => ['userOrgPerm'].includes(v.name));
+        if (!tabData) {
+          return;
+        }
+        item.loading = true;
         try {
-          const { id, checkList } = this.tableList[this.tableIndex];
           const params = {
-            id,
-            members: Object.keys(this.curDelMember).length > 0
-              ? [this.curDelMember]
-              : checkList.map(({ id, type }) => ({ id, type }))
+            limit: tabData.pagination.limit,
+            offset: tabData.pagination.limit * (tabData.pagination.current - 1),
+            id: item.id
           };
           const { current_role_id: currentRoleId, source } = this.$route.query;
           if (currentRoleId && source === 'email') {
             params.hidden = false;
           }
-          const { code } = await this.$store.dispatch('userGroup/deleteUserGroupMember', params);
-          if (code === 0) {
-            this.messageSuccess(this.$t(`m.info['移除成功']`), 3000);
-            this.currentSelectList = [];
-            this.tableList[this.tableIndex].checkList = [];
-            this.pagination.current = 1;
-            this.tableIndex = -1;
-            await this.fetchData(true);
-          }
+          const { data } = await this.$store.dispatch('renewal/getExpireSoonGroupMembers', params);
+          tabData.pagination.count = data.count || 0;
+          tabData.children = [...data.results || []];
+          tabData.children.forEach((sub) => {
+            sub.$id = `${item.id}${sub.type}${sub.id}`;
+            sub.parent = item;
+            sub.parent_id = item.id;
+            sub.parent_type = 'group';
+          });
         } catch (e) {
-          console.error(e);
           this.fetchErrorMsg(e);
         } finally {
-          this.deleteDialog.loading = false;
-          this.deleteDialog.visible = false;
+          item.loading = false;
+          this.fetchRefreshSelectList(item);
         }
       },
 
-      async fetchMembers (item) {
-        item.loading = true;
+      // 获取用户组关联模板列表
+      async fetchGroupSubjectTemplate (item) {
+        const tabData = item.groupTabList.find((v) => ['memberTemplate'].includes(v.name));
+        if (!tabData) {
+          return;
+        }
+        item.tableLoading = true;
         try {
           const params = {
-            limit: item.pagination.limit,
-            offset: item.pagination.limit * (item.pagination.current - 1),
-            id: item.id
+            limit: tabData.pagination.limit,
+            offset: tabData.pagination.limit * (tabData.pagination.current - 1),
+            id: item.id,
+            expire_soon: true
           };
           const { current_role_id: currentRoleId, source } = this.$route.query;
           if (currentRoleId && source === 'email') {
             params.hidden = false;
           }
-          const { data } = await this.$store.dispatch('renewal/getExpireSoonGroupMembers', params);
-          this.$set(item, 'children', []);
-          item.pagination.count = data.count || 0;
-          item.children.splice(0, item.children.length, ...(data.results || []));
-          item.children.forEach((sub) => {
-            sub.$id = `${item.id}${sub.type}${sub.id}`;
+          const { data } = await this.$store.dispatch('memberTemplate/getGroupSubjectTemplate', params);
+          tabData.pagination.count = data.count || 0;
+          tabData.children = [...data.results || []];
+          tabData.children.forEach((sub) => {
+            sub.$id = `${item.id}template${sub.id}`;
             sub.parent = item;
             sub.parent_id = item.id;
             sub.parent_type = 'group';
+            sub.type = 'template';
           });
         } catch (e) {
-          console.error(e);
           this.fetchErrorMsg(e);
         } finally {
-          item.loading = false;
+          item.tableLoading = false;
+          this.fetchRefreshSelectList(item);
         }
       },
 
@@ -324,60 +419,319 @@
           this.tableList.splice(0, this.tableList.length, ...(data.results || []));
           this.tableList.forEach(async (item, index) => {
             this.$set(item, 'checkList', []);
-            this.$set(item, 'children', []);
+            this.$set(item, 'groupTabList', cloneDeep(this.groupTabList));
             this.$set(item, 'loading', false);
+            this.$set(item, 'tableLoading', false);
             this.$set(item, 'expanded', false);
-            this.$set(item, 'pagination', {
-              current: 1,
-              limit: 10,
-              count: 0
-            });
+            this.$set(item, 'tabActive', 'userOrgPerm');
+            this.$set(item, 'tableProps', this.getTableProps(item.tabActive));
             item.currentBackup = 1;
             if (index === 0) {
               this.$set(item, 'expanded', true);
-              await this.fetchMembers(item);
             }
           });
+          this.handleRefreshTabCount();
         } catch (e) {
-          console.error(e);
           this.fetchErrorMsg(e);
         } finally {
           this.tableLoading = false;
         }
       },
 
-      async handleExpanded (payload, item) {
-        item.pagination.current = 1;
-        item.pagination.limit = 10;
-        item.pagination.count = 0;
-        await this.fetchMembers(item);
+      async handleTabChange (row, index, payload) {
+        row = Object.assign(row, { tabActive: payload, tableProps: this.getTableProps(payload) });
+        this.getTableAllCustom(row, index);
+      },
+
+      async getTableAllCustom (row, index) {
+        await this.handleRefreshTab(row);
+        this.fetchRefreshSelectList(row);
+        this.fetchCustomTotal(index);
+      },
+
+      getDefaultSelect (item) {
+        const curData = item.parent.groupTabList.find((v) => v.name === item.parent.tabActive);
+        if (curData) {
+          return curData.children && curData.children.length > 0;
+        }
+        return false;
+      },
+
+      getTableProps (payload) {
+        const tabMap = {
+          userOrgPerm: () => {
+            return [
+              { label: this.$t(`m.userGroup['用户/组织']`), prop: 'name' },
+              { label: this.$t(`m.common['有效期']`), prop: 'expired_at_display' },
+              { label: this.$t(`m.common['操作-table']`), prop: 'operate' }
+            ];
+          },
+          memberTemplate: () => {
+            return [
+              { label: this.$t(`m.memberTemplate['人员模板']`), prop: 'template_name' },
+              { label: this.$t(`m.common['有效期']`), prop: 'expired_at_display' },
+              { label: this.$t(`m.common['备注']`), prop: 'description' },
+              { label: this.$t(`m.common['加入时间']`), prop: 'created_time' },
+              { label: this.$t(`m.common['操作-table']`), prop: 'operate' }
+            ];
+          }
+        };
+        return tabMap[payload]();
+      },
+
+      formatDisabled (payload) {
+        const { checkList } = payload;
+        return !checkList.length;
+      },
+
+      handleBatchDelete (payload, index) {
+        const { checkList } = payload;
+        const userOrgList = checkList.filter((item) => ['user', 'department'].includes(item.type));
+        const tempList = checkList.filter((item) => ['template'].includes(item.type));
+        let userOrgTip = '';
+        let tempTip = '';
+        let commaTip = '';
+        if (userOrgList.length) {
+          userOrgTip = `${this.$t(`m.common['移除']`)} ${userOrgList.length} ${this.$t(`m.common['位成员']`)}${this.$t(`m.common['，']`)}${this.$t(`m.renewal['这些成员在该用户组将不再存在续期']`)}`;
+        }
+        if (tempList.length) {
+          tempTip = `${this.$t(`m.common['移除']`)} ${tempList.length} ${this.$t(`m.common['个人员模板']`)}${this.$t(`m.common['，']`)}${this.$t(`m.info['这些人员模板关联的该用户组将不再存在续期']`)}${this.$t(`m.common['。']`)}`;
+        }
+        if (userOrgList.length > 0 && tempList.length > 0) {
+          commaTip = this.$t(`m.common['。']`);
+        }
+        this.deleteDialog.subTitle = `${userOrgTip}${commaTip}${tempTip}`;
+        this.tableIndex = index;
+        this.curDelMember = {};
+        this.deleteDialog.visible = true;
+      },
+
+      handleDelete (payload, index) {
+        this.tableIndex = index;
+        const { tabActive } = this.tableList[index];
+        const typeMap = {
+          userOrgPerm: () => {
+            this.deleteDialog.subTitle = `${this.$t(`m.common['移除']`)}${this.$t(`m.common['【']`)}${payload.id}(${payload.name})${this.$t(`m.common['】']`)}${this.$t(`m.common['，']`)}${this.$t(`m.renewal['该成员在该用户组将不再存在续期']`)}`;
+            this.curDelMember = Object.assign({}, {
+              id: payload.id,
+              type: payload.type
+            });
+            this.deleteDialog.visible = true;
+          },
+          memberTemplate: () => {
+            this.deleteDialog.subTitle = `${this.$t(`m.common['移除']`)}${this.$t(`m.common['【']`)}${payload.name}${this.$t(`m.common['】']`)}${this.$t(
+              `m.common['，']`)}${this.$t(`m.info['人员模板关联的该用户组将不再存在续期']`)}${this.$t(`m.common['。']`)}`;
+            this.curDelMember = Object.assign({}, {
+              id: payload.id,
+              type: 'template'
+            });
+            this.deleteDialog.visible = true;
+          }
+        };
+        return typeMap[tabActive]();
+      },
+
+      handleAfterDeleteLeave () {
+        this.deleteDialog.subTitle = '';
+        this.curDelMember = {};
+      },
+
+      hideCancelDelete () {
+        this.deleteDialog.visible = false;
+      },
+
+      handleRefreshTabCount () {
+        this.$nextTick(() => {
+          if (this.$refs.tabRef && this.$refs.tabRef.length) {
+            this.$refs.tabRef.forEach((item) => {
+              item.$refs.tabLabel.forEach((label) => label.$forceUpdate());
+            });
+          }
+        });
+      },
+      
+      fetchCustomTotal (index) {
+        const { checkList, tabActive, name, id } = this.tableList[index];
+        this.$nextTick(() => {
+          const selectionCount = document.getElementsByClassName('bk-page-selection-count');
+          let tableIndex = -1;
+          if (this.$refs.permTableRef && this.$refs.permTableRef.length) {
+            tableIndex = this.$refs.permTableRef.findIndex((v) => v.$el.dataset.customKey === `${name}&${id}-${index}`);
+          }
+          if (
+            selectionCount
+            && selectionCount.length
+            && selectionCount[tableIndex]
+            && selectionCount[tableIndex].children
+          ) {
+            const typeMap = {
+              userOrgPerm: () => {
+                const list = checkList.filter((item) => ['user', 'department'].includes(item.type));
+                selectionCount[tableIndex].children[0].innerHTML = list.length;
+              },
+              memberTemplate: () => {
+                const list = checkList.filter((item) => ['template'].includes(item.type));
+                selectionCount[tableIndex].children[0].innerHTML = list.length;
+              }
+            };
+            return typeMap[tabActive]();
+          }
+        });
+      },
+
+      fetchRefreshSelectList (payload) {
+        const tableIndex = this.tableList.findIndex((item) => item.id === payload.id);
+        const emptyField = payload.groupTabList.find(item => item.name === payload.tabActive);
+        if (emptyField) {
+          this.$nextTick(() => {
+            const selectList = payload.checkList.map((item) => String(item.id));
+            let curTableRef = null;
+            const checkList = payload.checkList.map((v) => `${v.id}&${v.name}`);
+            if (this.$refs.permTableRef && this.$refs.permTableRef.length) {
+              curTableRef = this.$refs.permTableRef.find((v) => v.$el.dataset.customKey === `${payload.name}&${payload.id}-${tableIndex}`);
+            }
+            emptyField.children.forEach((item) => {
+              if (
+                selectList.includes(String(item.id))
+                && this.$refs.permTableRef.length
+                && tableIndex > -1
+                && curTableRef
+              ) {
+                if (curTableRef && checkList.includes(`${item.id}&${item.name}`)) {
+                  curTableRef.toggleRowSelection(item, true);
+                }
+              }
+            });
+            if (!payload.checkList.length && this.$refs.permTableRef.length && tableIndex > -1 && curTableRef) {
+              curTableRef.clearSelection();
+            }
+            this.handleRefreshTabCount();
+          });
+        }
       },
 
-      handlePageChange (page) {
+      async handleSubmitDelete () {
+        this.deleteDialog.loading = true;
+        try {
+          const { id, checkList } = this.tableList[this.tableIndex];
+          const params = {
+            id,
+            members: Object.keys(this.curDelMember).length > 0
+              ? [this.curDelMember]
+              : checkList.map(({ id, type }) => ({ id, type }))
+          };
+          const { current_role_id: currentRoleId, source } = this.$route.query;
+          if (currentRoleId && source === 'email') {
+            params.hidden = false;
+          }
+          const { code } = await this.$store.dispatch('userGroup/deleteUserGroupMember', params);
+          if (code === 0) {
+            this.messageSuccess(this.$t(`m.info['移除成功']`), 3000);
+            this.currentSelectList = [];
+            this.pagination.current = 1;
+            this.tableList[this.tableIndex] = Object.assign(this.tableList[this.tableIndex], {
+              expanded: true,
+              checkList: []
+            });
+            await Promise.all([
+              this.fetchMembers(this.tableList[this.tableIndex]),
+              this.fetchGroupSubjectTemplate(this.tableList[this.tableIndex])
+            ]);
+          }
+        } catch (e) {
+          this.fetchErrorMsg(e);
+        } finally {
+          this.deleteDialog.loading = false;
+          this.deleteDialog.visible = false;
+          this.tableIndex = -1;
+        }
+      },
+
+      async handleExpanded (isExpand, payload, index) {
+        if (isExpand) {
+          this.$nextTick(() => {
+            let curTableRef = null;
+            const checkList = payload.checkList.map((item) => `${item.id}&${item.name}`);
+            if (this.$refs.permTableRef && this.$refs.permTableRef.length) {
+              curTableRef = this.$refs.permTableRef.find((v) => v.$el.dataset.customKey === `${payload.name}&${payload.id}-${index}`);
+            }
+            payload.groupTabList && payload.groupTabList.forEach((item) => {
+              if (item.name === payload.tabActive) {
+                item.children && item.children.forEach((sub) => {
+                  if (curTableRef && checkList.includes(`${sub.id}&${sub.name}`)) {
+                    curTableRef.toggleRowSelection(sub, true);
+                  }
+                });
+              }
+            });
+          });
+        }
+      },
+
+      async handlePageChange (page) {
         if (this.currentBackup === page) {
           return;
         }
         this.pagination.current = page;
-        this.fetchData(true);
+        await this.fetchPageData();
       },
 
-      handleLimitChange (currentLimit, prevLimit) {
-        this.pagination = Object.assign(this.pagination, { current: 1, limit: currentLimit });
-        this.fetchData(true);
+      async handleLimitChange (limit) {
+        this.pagination = Object.assign(this.pagination, { current: 1, limit });
+        await this.fetchPageData();
+      },
+
+      async handleRefreshTab (payload) {
+        payload.currentBackup = 1;
+        const tabData = payload.groupTabList.find((v) => v.name === payload.tabActive);
+        if (tabData) {
+          tabData.pagination = Object.assign(tabData.pagination, { current: 1, limit: 10 });
+        }
+        const tabMap = {
+          userOrgPerm: async () => {
+            await this.fetchMembers(payload);
+          },
+          memberTemplate: async () => {
+            await this.fetchGroupSubjectTemplate(payload);
+          }
+        };
+        return tabMap[payload.tabActive]();
       },
 
-      pageChange (page, payload) {
+      handleTablePageChange (page, prev, payload) {
         if (payload.currentBackup === page) {
           return;
         }
-        payload.pagination.current = page;
-        payload.currentBackup = page;
-        this.fetchMembers(payload);
+        const curData = payload.groupTabList.find((v) => v.name === payload.tabActive);
+        if (curData) {
+          payload.currentBackup = page;
+          curData.pagination.current = page;
+          const typeMap = {
+            userOrgPerm: () => {
+              this.fetchMembers(payload);
+            },
+            memberTemplate: () => {
+              this.fetchGroupSubjectTemplate(payload);
+            }
+          };
+          typeMap[curData.name]();
+        }
       },
 
-      limitChange (currentLimit, prevLimit, payload) {
-        payload.pagination = Object.assign(payload.pagination, { current: 1, limit: currentLimit });
-        this.fetchMembers(payload);
+      handleTableLimitChange (limit, prevLimit, payload) {
+        const curData = payload.groupTabList.find((v) => v.name === payload.tabActive);
+        if (curData) {
+          curData.pagination = Object.assign(curData.pagination, { current: 1, limit });
+          const typeMap = {
+            userOrgPerm: () => {
+              this.fetchMembers(payload);
+            },
+            memberTemplate: () => {
+              this.fetchGroupSubjectTemplate(payload);
+            }
+          };
+          typeMap[curData.name]();
+        }
       },
 
       setExpiredAt () {
@@ -385,8 +739,8 @@
           if (this.expiredAt === PERMANENT_TIMESTAMP) {
             return this.expiredAt;
           }
-          if (payload < this.user.timestamp) {
-            return this.user.timestamp + this.expiredAt;
+          if (payload < getNowTimeExpired()) {
+            return getNowTimeExpired() + this.expiredAt;
           }
           return payload + this.expiredAt;
         };
@@ -396,23 +750,57 @@
         });
       },
 
+      fetchSelectedGroups (type, index, payload, row) {
+        const typeMap = {
+          multiple: () => {
+            const isChecked = payload.length && payload.indexOf(row) !== -1;
+            if (isChecked) {
+              this.tableList[index].checkList.push(row);
+            } else {
+              this.tableList[index].checkList = this.tableList[index].checkList.filter(
+                (item) => item.id.toString() !== row.id.toString()
+              );
+            }
+            this.fetchCustomTotal(index);
+          },
+          all: () => {
+            const { groupTabList, tabActive } = this.tableList[index];
+            const emptyField = groupTabList.find((item) => item.name === tabActive);
+            if (emptyField) {
+              const tableList = cloneDeep(emptyField.children);
+              const selectGroups = this.tableList[index].checkList.filter(
+                (item) => !tableList.map((v) => String(v.id)).includes(String(item.id))
+              );
+              this.tableList[index].checkList = [...selectGroups, ...payload];
+              this.fetchCustomTotal(index);
+            }
+          }
+        };
+        return typeMap[type]();
+      },
+
       handlerAllChange (selection, index) {
         this.isShowErrorTips = false;
-        this.currentSelectList = _.cloneDeep(selection);
-        this.tableList[index].checkList = _.cloneDeep(selection);
-        this.setExpiredAt();
+        this.fetchSelectedGroups('all', index, selection);
       },
 
       handlerChange (selection, row, index) {
         this.isShowErrorTips = false;
-        this.currentSelectList = _.cloneDeep(selection);
-        this.tableList[index].checkList = _.cloneDeep(selection);
+        this.fetchSelectedGroups('multiple', index, selection, row);
+      },
+
+      // 同步更新每个表格的续期时间
+      handleGetRenewalTime () {
+        this.currentSelectList = this.tableList.map((item) => item.checkList).flat(Infinity);
         this.setExpiredAt();
       },
 
       handleDeadlineChange (payload) {
-        this.expiredAt = payload || ONE_DAY_TIMESTAMP;
-        this.setExpiredAt();
+        if (payload) {
+          this.isShowExpiredError = false;
+        }
+        this.expiredAt = payload;
+        this.handleGetRenewalTime();
       },
 
       async handleSubmit () {
@@ -420,7 +808,12 @@
           this.isShowErrorTips = true;
           return;
         }
+        if (!this.expiredAt) {
+          this.isShowExpiredError = true;
+          return;
+        }
         this.submitLoading = true;
+        this.handleGetRenewalTime();
         const params = {
           members: this.currentSelectList.map(({ type, id, parent_type, parent_id, expired_at_new }) => ({
             type,
@@ -434,6 +827,7 @@
         if (currentRoleId && source === 'email') {
           params.hidden = false;
         }
+        console.log(params, '参数');
         try {
           await this.$store.dispatch('renewal/roleGroupsRenewal', params);
           this.messageSuccess(this.$t(`m.renewal['批量申请提交成功']`), 3000);
@@ -441,13 +835,24 @@
             name: 'userGroup'
           });
         } catch (e) {
-          console.error(e);
           this.fetchErrorMsg(e);
         } finally {
           this.submitLoading = false;
         }
       },
 
+      resetPagination (payload) {
+        payload.currentBackup = 1;
+        payload.groupTabList.forEach((item) => {
+          item.pagination = Object.assign(item.pagination, {
+            current: 1,
+            limit: 10,
+            count: 0,
+            showTotalCount: true
+          });
+        });
+      },
+
       fetchErrorMsg (payload) {
         this.messageAdvancedError(payload);
       },
@@ -459,13 +864,12 @@
       },
 
       handleEmptyRefresh () {
-        this.pagination = Object.assign(this.pagination, { current: 1, limit: 10 });
-        this.fetchData(true);
+        this.fetchPageData();
       }
     }
   };
 </script>
-<style lang="postcss">
+<style lang="postcss" scoped>
 .iam-role-group-perm-renewal-wrapper {
   .group-content-wrapper {
     position: relative;
@@ -484,11 +888,15 @@
   .group-perm-renewal-cls {
     margin-bottom: 16px;
   }
-  .group-member-renewal-table-wrapper {
+  /deep/.group-member-renewal-table-wrapper {
     min-height: 200px;
     margin-top: 16px;
     .perm-renewal-table {
       border: none;
+      .bk-table-fixed,
+      .bk-table-fixed-right {
+        border-bottom: 0;
+      }
     }
   }
   .error-tips {
@@ -496,6 +904,40 @@
     top: -10px;
     font-size: 12px;
     color: #ea3636;
+    &.expired-at-error {
+      top: 4px;
+    }
+  }
+  .member-template {
+    padding: 4px 6px;
+    width: max-content;
+    color: #313238;
+    i {
+      color: #979ba5;
+    }
+  }
+  /deep/ .group-renewal-member-wrapper {
+    .group-tab-wrapper {
+      margin-top: 16px;
+      .bk-tab-section {
+        display: none;
+      }
+      .panel-count {
+        min-width: 16px;
+        height: 16px;
+        line-height: 16px;
+        padding: 0 8px;
+        border-radius: 8px;
+        text-align: center;
+        font-size: 12px;
+        color: #979ba5;
+        background-color: #f0f1f5;
+        &-active {
+          background-color: #e1ecff;
+          color: #3a84ff;
+        }
+      }
+    }
   }
 }
 </style>
diff --git a/frontend/src/views/resource-permiss/index.vue b/frontend/src/views/resource-permiss/index.vue
index b991dd652..8a5630aaa 100644
--- a/frontend/src/views/resource-permiss/index.vue
+++ b/frontend/src/views/resource-permiss/index.vue
@@ -29,8 +29,9 @@
               style="width: 200px; background: #fff"
               v-model="systemId"
               :clearable="true"
+              :searchable="true"
               :placeholder="$t(`m.verify['请选择']`)"
-              :disabled="['system_manager'].includes(user.role.type)"
+              :disabled="isSystemDisabled"
               @change="handleCascadeChange"
               @clear="handleSystemClear">
               <bk-option v-for="option in systemList"
@@ -107,7 +108,7 @@
           <iam-form-item :label="$t(`m.resourcePermiss['条数展示']`)" class="pb20 pr20">
             <bk-select
               style="width: 200px; background: #fff"
-              v-model="pagination.limit"
+              v-model="limit"
               :clearable="false"
               :placeholder="$t(`m.verify['请选择']`)"
               @change="limitChange">
@@ -241,8 +242,8 @@
         typeList: [{ name: this.$t(`m.resourcePermiss['自定义权限']`), value: 'custom' }, { name: this.$t(`m.resourcePermiss['模板权限']`), value: 'template' }],
         permissionType: '',
         groupValue: '1-1',
-        limit: 100,
-        limitList: [10, 20, 50, 100],
+        limit: 1000,
+        limitList: [10, 50, 100, 500, 1000],
         resourceActionId: 0,
         resourceActionSystemId: '',
         resourceSystemId: '',
@@ -269,7 +270,7 @@
         pagination: {
           current: 1,
           count: 0,
-          limit: 100
+          limit: 10
         },
         currentBackup: 1,
         emptyData: {
@@ -283,7 +284,7 @@
       };
     },
     computed: {
-      ...mapGetters(['externalSystemId', 'user']),
+      ...mapGetters(['externalSystemId', 'user', 'index']),
       condition () {
           if (this.curResIndex === -1 || this.groupIndex === -1) {
               return [];
@@ -309,6 +310,9 @@
       },
       isShowExport () {
         return ['resourcePermiss'].includes(this.$route.name);
+      },
+      isSystemDisabled () {
+        return this.index === 1 && ['system_manager'].includes(this.user.role.type);
       }
     },
     watch: {
@@ -459,7 +463,7 @@
         // 区分管理空间下和平台管理下的资源权限管理的业务
         const { current, limit } = this.pagination;
         const params = {
-          limit,
+          limit: this.limit,
           system_id: this.systemId || '',
           action_id: this.actionId,
           resource_instances: resourceInstances || []
@@ -554,13 +558,16 @@
       // 重置
       handleReset () {
         this.searchType = 'resource_instance';
-        this.systemId = '';
+        if (!this.isSystemDisabled) {
+          this.systemId = '';
+        }
         this.actionId = '';
         this.permissionType = '';
+        this.limit = 1000;
         this.tableList = [];
         this.resourceInstances = [];
         this.resourceTypeData = { isEmpty: true };
-        this.pagination = Object.assign(this.pagination, { current: 1, limit: 100, showTotalCount: true });
+        this.pagination = Object.assign(this.pagination, { current: 1, limit: 10, showTotalCount: true });
         this.emptyData = {
           type: 'empty',
           text: '暂无数据',
@@ -679,7 +686,7 @@
       handleSearch () {
         const routeMap = {
           resourcePermManage: async () => {
-            this.pagination = Object.assign(this.pagination, { current: 1, limit: 100 });
+            this.pagination = Object.assign(this.pagination, { current: 1, limit: 10 });
             await this.handleSearchAndExport();
           },
           resourcePermiss: () => {
@@ -750,7 +757,7 @@
       },
 
       limitChange (limit) {
-        this.pagination = Object.assign(this.pagination, { current: 1, limit });
+        this.limit = limit;
         const routeMap = {
           resourcePermManage: async () => {
             await this.handleSearchAndExport();
diff --git a/saas/VERSION b/saas/VERSION
index 8b5105c95..e7db24966 100644
--- a/saas/VERSION
+++ b/saas/VERSION
@@ -1 +1 @@
-1.10.26
+1.10.27
diff --git a/saas/backend/api/admin/constants.py b/saas/backend/api/admin/constants.py
index 1e8f8cbfc..9e934441f 100644
--- a/saas/backend/api/admin/constants.py
+++ b/saas/backend/api/admin/constants.py
@@ -8,9 +8,10 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
-from aenum import auto, skip
+from aenum import LowerStrEnum, auto, skip
 
 from backend.api.constants import BaseAPIEnum
+from backend.util.enum import ChoicesEnum
 
 
 class AdminAPIEnum(BaseAPIEnum):
@@ -18,15 +19,26 @@ class AdminAPIEnum(BaseAPIEnum):
 
     # 用户组
     GROUP_LIST = auto()
+    GROUP_BATCH_CREATE = auto()
+    GROUP_UPDATE = auto()
+    GROUP_DELETE = auto()
+
     # 用户组成员
     GROUP_MEMBER_LIST = auto()
 
+    # 用户组权限
+    GROUP_POLICY_GRANT = auto()
+
+    # 模板
+    TEMPLATE_CREATE = auto()
+
     # Subject
     SUBJECT_JOINED_GROUP_LIST = auto()
     SUBJECT_ROLE_LIST = auto()
 
     # System
     SYSTEM_LIST = auto()
+    SYSTEM_PROVIDER_CONFIG_LIST = auto()
 
     # 角色
     ROLE_SUPER_MANAGER_MEMBER_LIST = auto()
@@ -47,8 +59,14 @@ class AdminAPIEnum(BaseAPIEnum):
     _choices_labels = skip(
         (
             (SYSTEM_LIST, "获取系统列表"),
+            (SYSTEM_PROVIDER_CONFIG_LIST, "获取系统回调信息"),
             (GROUP_LIST, "获取用户组列表"),
+            (GROUP_BATCH_CREATE, "批量创建用户组"),
+            (GROUP_UPDATE, "更新用户组"),
+            (GROUP_DELETE, "删除用户组"),
             (GROUP_MEMBER_LIST, "获取用户组成员列表"),
+            (GROUP_POLICY_GRANT, "授权用户组"),
+            (TEMPLATE_CREATE, "新建模板"),
             (SUBJECT_JOINED_GROUP_LIST, "获取Subject加入的用户组列表"),
             (SUBJECT_ROLE_LIST, "获取Subject角色列表"),
             (ROLE_SUPER_MANAGER_MEMBER_LIST, "获取超级管理员成员列表"),
@@ -59,3 +77,9 @@ class AdminAPIEnum(BaseAPIEnum):
             (SUBJECT_PERMISSION_EXISTS, "权限是否存在"),
         )
     )
+
+
+class VerifyApiParamLocationEnum(ChoicesEnum, LowerStrEnum):
+    GROUP_IN_PATH = auto()
+
+    _choices_labels = skip(((GROUP_IN_PATH, "在URL里的group id参数"),))
diff --git a/saas/backend/api/admin/migrations/0002_alter_adminapiallowlistconfig_api.py b/saas/backend/api/admin/migrations/0002_alter_adminapiallowlistconfig_api.py
new file mode 100644
index 000000000..099a058a6
--- /dev/null
+++ b/saas/backend/api/admin/migrations/0002_alter_adminapiallowlistconfig_api.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.16 on 2024-04-09 06:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_admin', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='adminapiallowlistconfig',
+            name='api',
+            field=models.CharField(choices=[('system_list', '获取系统列表'), ('group_list', '获取用户组列表'), ('group_batch_create', '批量创建用户组'), ('group_update', '更新用户组'), ('group_delete', '删除用户组'), ('group_member_list', '获取用户组成员列表'), ('subject_joined_group_list', '获取Subject加入的用户组列表'), ('subject_role_list', '获取Subject角色列表'), ('role_super_manager_member_list', '获取超级管理员成员列表'), ('role_system_manager_member_list', '获取系统管理员及成员列表'), ('audit_event_list', '获取审计事件列表'), ('subject_freeze_unfreeze', '冻结/解冻Subject'), ('subject_permission_cleanup', '权限清理'), ('subject_permission_exists', '权限是否存在')], help_text='*代表任意', max_length=32, verbose_name='API'),
+        ),
+    ]
diff --git a/saas/backend/api/admin/serializers.py b/saas/backend/api/admin/serializers.py
index 33f515e41..734703944 100644
--- a/saas/backend/api/admin/serializers.py
+++ b/saas/backend/api/admin/serializers.py
@@ -10,9 +10,12 @@
 """
 from rest_framework import serializers
 
+from backend.api.management.v2.serializers import ManagementGradeManagerGroupCreateSLZ
 from backend.apps.group.models import Group
+from backend.apps.group.serializers import GroupAuthorizationSLZ
 from backend.apps.role.models import Role
 from backend.apps.role.serializers import BaseGradeMangerSLZ
+from backend.apps.template.serializers import TemplateCreateSLZ, TemplateIdSLZ
 from backend.service.constants import GroupMemberType, RoleType
 
 
@@ -22,6 +25,10 @@ class Meta:
         fields = ("id", "name", "description")
 
 
+class AdminGroupCreateSLZ(ManagementGradeManagerGroupCreateSLZ):
+    pass
+
+
 class AdminGroupMemberSLZ(serializers.Serializer):
     type = serializers.ChoiceField(label="成员类型", choices=GroupMemberType.get_choices())
     id = serializers.CharField(label="成员id")
@@ -35,6 +42,15 @@ class AdminSubjectGroupSLZ(serializers.Serializer):
     expired_at = serializers.IntegerField(label="过期时间戳(单位秒)")
 
 
+class AdminGroupAuthorizationSLZ(GroupAuthorizationSLZ):
+    pass
+
+
+class AdminSystemProviderConfigSLZ(serializers.Serializer):
+    token = serializers.CharField(label="回调token")
+    host = serializers.CharField(label="回调地址")
+
+
 class SystemManageSLZ(serializers.Serializer):
     managers = serializers.ListField(child=serializers.CharField(label="成员"), max_length=100)
 
@@ -73,3 +89,11 @@ class SubjectSLZ(serializers.Serializer):
 class FreezeSubjectResponseSLZ(serializers.Serializer):
     type = serializers.CharField(label="SubjectType")
     id = serializers.CharField(label="SubjectID")
+
+
+class AdminTemplateCreateSLZ(TemplateCreateSLZ):
+    pass
+
+
+class AdminTemplateIdSLZ(TemplateIdSLZ):
+    pass
diff --git a/saas/backend/api/admin/urls.py b/saas/backend/api/admin/urls.py
index cb623bbb9..0f1c7c2e0 100644
--- a/saas/backend/api/admin/urls.py
+++ b/saas/backend/api/admin/urls.py
@@ -14,13 +14,27 @@
 
 urlpatterns = [
     # 用户组
-    path("groups/", views.AdminGroupViewSet.as_view({"get": "list"}), name="open.admin.group"),
+    path("groups/", views.AdminGroupViewSet.as_view({"get": "list", "post": "create"}), name="open.admin.group"),
+    # 用户组基本信息更新 & 删除
+    path(
+        "groups/<int:id>/",
+        views.AdminGroupInfoViewSet.as_view({"get": "update", "delete": "destroy"}),
+        name="open.admin.group",
+    ),
     # 用户组成员
     path(
         "groups/<int:id>/members/",
         views.AdminGroupMemberViewSet.as_view({"get": "list"}),
         name="open.admin.group_member",
     ),
+    # 用户组授权
+    path(
+        "groups/<str:id>/policies/",
+        views.AdminGroupPolicyViewSet.as_view({"post": "create"}),
+        name="open.admin.group_policy",
+    ),
+    # 模板
+    path("templates/", views.AdminTemplateViewSet.as_view({"post": "create"}), name="open.admin.template"),
     # Subject
     path(
         "subjects/<str:subject_type>/<str:subject_id>/groups/",
@@ -33,6 +47,12 @@
         views.AdminSystemViewSet.as_view({"get": "list"}),
         name="open.admin.system",
     ),
+    # 系统回调信息
+    path(
+        "systems/<str:system_id>/provider_config/",
+        views.AdminSystemProviderConfigViewSet.as_view({"get": "list"}),
+        name="open.admin.system_provider_config",
+    ),
     # 超级管理员成员列表  get
     path(
         "roles/super_managers/members/",
diff --git a/saas/backend/api/admin/views/__init__.py b/saas/backend/api/admin/views/__init__.py
index a6c8f3fcb..f3d4763e8 100644
--- a/saas/backend/api/admin/views/__init__.py
+++ b/saas/backend/api/admin/views/__init__.py
@@ -9,7 +9,7 @@
 specific language governing permissions and limitations under the License.
 """
 from .audit import AdminAuditEventViewSet
-from .group import AdminGroupMemberViewSet, AdminGroupViewSet
+from .group import AdminGroupInfoViewSet, AdminGroupMemberViewSet, AdminGroupPolicyViewSet, AdminGroupViewSet
 from .role import AdminSuperManagerMemberViewSet, AdminSystemManagerMemberViewSet
 from .subject import (
     AdminSubjectFreezeViewSet,
@@ -18,10 +18,12 @@
     AdminSubjectPermissionExistsViewSet,
     AdminSubjectRoleViewSet,
 )
-from .system import AdminSystemViewSet
+from .system import AdminSystemProviderConfigViewSet, AdminSystemViewSet
+from .template import AdminTemplateViewSet
 
 __all__ = [
     "AdminGroupViewSet",
+    "AdminGroupInfoViewSet",
     "AdminGroupMemberViewSet",
     "AdminSubjectGroupViewSet",
     "AdminSuperManagerMemberViewSet",
@@ -32,4 +34,7 @@
     "AdminSubjectFreezeViewSet",
     "AdminSubjectPermissionCleanupViewSet",
     "AdminSubjectPermissionExistsViewSet",
+    "AdminTemplateViewSet",
+    "AdminGroupPolicyViewSet",
+    "AdminSystemProviderConfigViewSet",
 ]
diff --git a/saas/backend/api/admin/views/group.py b/saas/backend/api/admin/views/group.py
index aaa2bf0a0..f9879d99f 100644
--- a/saas/backend/api/admin/views/group.py
+++ b/saas/backend/api/admin/views/group.py
@@ -8,19 +8,38 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
+from typing import List
+
 from drf_yasg.utils import swagger_auto_schema
-from rest_framework import status
+from pydantic.tools import parse_obj_as
+from rest_framework import serializers, status
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet, mixins
 
-from backend.api.admin.constants import AdminAPIEnum
+from backend.api.admin.constants import AdminAPIEnum, VerifyApiParamLocationEnum
 from backend.api.admin.filters import GroupFilter
 from backend.api.admin.permissions import AdminAPIPermission
-from backend.api.admin.serializers import AdminGroupBasicSLZ, AdminGroupMemberSLZ
+from backend.api.admin.serializers import (
+    AdminGroupAuthorizationSLZ,
+    AdminGroupBasicSLZ,
+    AdminGroupCreateSLZ,
+    AdminGroupMemberSLZ,
+)
 from backend.api.authentication import ESBAuthentication
+from backend.api.management.v2.views import ManagementGroupViewSet
+from backend.apps.group.audit import GroupCreateAuditProvider, GroupTemplateCreateAuditProvider
+from backend.apps.group.constants import OperateEnum
 from backend.apps.group.models import Group
-from backend.biz.group import GroupBiz
+from backend.apps.group.views import check_readonly_group
+from backend.apps.role.models import Role
+from backend.audit.audit import add_audit, audit_context_setter, view_audit_decorator
+from backend.audit.constants import AuditSourceType
+from backend.biz.group import GroupBiz, GroupCheckBiz, GroupCreationBean
+from backend.biz.role import RoleBiz
+from backend.common.lock import gen_group_upsert_lock
 from backend.common.pagination import CompatiblePagination
+from backend.service.constants import GroupSaaSAttributeEnum, RoleType
+from backend.trans.group import GroupTrans
 
 
 class AdminGroupViewSet(mixins.ListModelMixin, GenericViewSet):
@@ -29,13 +48,16 @@ class AdminGroupViewSet(mixins.ListModelMixin, GenericViewSet):
     authentication_classes = [ESBAuthentication]
     permission_classes = [AdminAPIPermission]
 
-    admin_api_permission = {"list": AdminAPIEnum.GROUP_LIST.value}
+    admin_api_permission = {"list": AdminAPIEnum.GROUP_LIST.value, "create": AdminAPIEnum.GROUP_BATCH_CREATE.value}
 
     queryset = Group.objects.all()
     serializer_class = AdminGroupBasicSLZ
     filterset_class = GroupFilter
     pagination_class = CompatiblePagination
 
+    group_biz = GroupBiz()
+    group_check_biz = GroupCheckBiz()
+
     @swagger_auto_schema(
         operation_description="用户组列表",
         responses={status.HTTP_200_OK: AdminGroupBasicSLZ(label="用户组信息", many=True)},
@@ -44,6 +66,63 @@ class AdminGroupViewSet(mixins.ListModelMixin, GenericViewSet):
     def list(self, request, *args, **kwargs):
         return super().list(request, *args, **kwargs)
 
+    @swagger_auto_schema(
+        operation_description="批量创建用户组",
+        request_body=AdminGroupCreateSLZ(label="用户组"),
+        responses={status.HTTP_200_OK: serializers.ListSerializer(child=serializers.IntegerField(label="用户组ID"))},
+        tags=["admin.group"],
+    )
+    def create(self, request, *args, **kwargs):
+        role = Role.objects.get(type=RoleType.SUPER_MANAGER.value)
+
+        serializer = AdminGroupCreateSLZ(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        groups_data = serializer.validated_data["groups"]
+        sync_subject_template = serializer.validated_data["sync_subject_template"]
+
+        # 用户组数量在角色内是否超限
+        self.group_check_biz.check_role_group_limit(role, len(groups_data))
+
+        infos = parse_obj_as(List[GroupCreationBean], groups_data)
+
+        attrs = None
+        if serializer.validated_data["create_attributes"]:
+            attrs = {
+                GroupSaaSAttributeEnum.SOURCE_TYPE.value: AuditSourceType.OPENAPI.value,
+            }
+
+        with gen_group_upsert_lock(role.id):
+            # 用户组名称在角色内唯一
+            group_names = [g["name"] for g in groups_data]
+            self.group_check_biz.batch_check_role_group_names_unique(role.id, group_names)
+
+            groups = self.group_biz.batch_create(
+                role,
+                infos,
+                request.user.username,
+                attrs=attrs,
+                sync_subject_template=sync_subject_template,
+            )
+
+        # 添加审计信息
+        # TODO: 后续其他地方也需要批量添加审计时再抽象出一个batch_add_audit方法，将for循环逻辑放到方法里
+        for g in groups:
+            add_audit(GroupCreateAuditProvider, request, group=g)
+
+        return Response([group.id for group in groups])
+
+
+class AdminGroupInfoViewSet(ManagementGroupViewSet):
+    """用户组"""
+
+    authentication_classes = [ESBAuthentication]
+    permission_classes = [AdminAPIPermission]
+
+    admin_api_permission = {
+        "update": (VerifyApiParamLocationEnum.GROUP_IN_PATH.value, AdminAPIEnum.GROUP_UPDATE.value),
+        "destroy": (VerifyApiParamLocationEnum.GROUP_IN_PATH.value, AdminAPIEnum.GROUP_DELETE.value),
+    }
+
 
 class AdminGroupMemberViewSet(GenericViewSet):
     """用户组成员"""
@@ -73,3 +152,48 @@ def list(self, request, *args, **kwargs):
         count, group_members = self.biz.list_paging_thin_group_member(group.id, limit, offset)
         results = [one.dict(include={"type", "id", "name", "expired_at"}) for one in group_members]
         return Response({"count": count, "results": results})
+
+
+class AdminGroupPolicyViewSet(GenericViewSet):
+    """用户组授权"""
+
+    authentication_classes = [ESBAuthentication]
+    permission_classes = [AdminAPIPermission]
+
+    admin_api_permission = {"create": AdminAPIEnum.GROUP_POLICY_GRANT.value}
+
+    pagination_class = None  # 去掉swagger中的limit offset参数
+    queryset = Group.objects.all()
+    lookup_field = "id"
+
+    group_biz = GroupBiz()
+    role_biz = RoleBiz()
+
+    group_trans = GroupTrans()
+
+    @swagger_auto_schema(
+        operation_description="用户组添加权限",
+        request_body=AdminGroupAuthorizationSLZ(label="授权信息"),
+        responses={status.HTTP_201_CREATED: serializers.Serializer()},
+        tags=["admin.group.policy"],
+    )
+    @view_audit_decorator(GroupTemplateCreateAuditProvider)
+    @check_readonly_group(operation=OperateEnum.GROUP_POLICY_CREATE.label)
+    def create(self, request, *args, **kwargs):
+        serializer = AdminGroupAuthorizationSLZ(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        group = self.get_object()
+        data = serializer.validated_data
+
+        role = self.role_biz.get_role_by_group_id(group.id)
+        templates = self.group_trans.from_group_grant_data(data["templates"])
+        self.group_biz.grant(role, group, templates)
+
+        # 写入审计上下文
+        audit_context_setter(
+            group=group,
+            templates=[{"system_id": t["system_id"], "template_id": t["template_id"]} for t in data["templates"]],
+        )
+
+        return Response({}, status=status.HTTP_201_CREATED)
diff --git a/saas/backend/api/admin/views/system.py b/saas/backend/api/admin/views/system.py
index 54fa22dcc..117d621ab 100644
--- a/saas/backend/api/admin/views/system.py
+++ b/saas/backend/api/admin/views/system.py
@@ -8,11 +8,17 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
+from drf_yasg.utils import swagger_auto_schema
+from rest_framework import status
+from rest_framework.response import Response
+from rest_framework.viewsets import GenericViewSet
 
 from backend.api.admin.constants import AdminAPIEnum
 from backend.api.admin.permissions import AdminAPIPermission
+from backend.api.admin.serializers import AdminSystemProviderConfigSLZ
 from backend.api.authentication import ESBAuthentication
 from backend.apps.system.views import SystemViewSet
+from backend.service.resource import SystemProviderConfigService
 
 
 class AdminSystemViewSet(SystemViewSet):
@@ -30,3 +36,20 @@ def list(self, request, *args, **kwargs):
         request.query_params["hidden"] = False
 
         return super().list(request, *args, **kwargs)
+
+
+class AdminSystemProviderConfigViewSet(GenericViewSet):
+    authentication_classes = [ESBAuthentication]
+    permission_classes = [AdminAPIPermission]
+    admin_api_permission = {"list": AdminAPIEnum.SYSTEM_PROVIDER_CONFIG_LIST.value}
+
+    @swagger_auto_schema(
+        operation_description="系统回调信息",
+        responses={status.HTTP_200_OK: AdminSystemProviderConfigSLZ(label="系统回调信息")},
+        tags=["admin.system.provider_config"],
+    )
+    def list(self, request, *args, **kwargs):
+        system_id = kwargs["system_id"]
+        system_provider_config = SystemProviderConfigService().get_provider_config(system_id=system_id)
+
+        return Response(AdminSystemProviderConfigSLZ(system_provider_config).data)
diff --git a/saas/backend/api/admin/views/template.py b/saas/backend/api/admin/views/template.py
new file mode 100644
index 000000000..c499d68b8
--- /dev/null
+++ b/saas/backend/api/admin/views/template.py
@@ -0,0 +1,60 @@
+from drf_yasg.utils import swagger_auto_schema
+from rest_framework import status
+from rest_framework.response import Response
+from rest_framework.viewsets import GenericViewSet
+
+from backend.api.admin.constants import AdminAPIEnum
+from backend.api.admin.permissions import AdminAPIPermission
+from backend.api.admin.serializers import AdminTemplateCreateSLZ, AdminTemplateIdSLZ
+from backend.api.authentication import ESBAuthentication
+from backend.apps.role.models import Role
+from backend.apps.template.audit import TemplateCreateAuditProvider
+from backend.audit.audit import audit_context_setter, view_audit_decorator
+from backend.biz.role import RoleAuthorizationScopeChecker
+from backend.biz.template import TemplateBiz, TemplateCheckBiz, TemplateCreateBean
+from backend.common.lock import gen_template_upsert_lock
+from backend.service.constants import RoleType
+
+
+class AdminTemplateViewSet(GenericViewSet):
+    """模板"""
+
+    authentication_classes = [ESBAuthentication]
+    permission_classes = [AdminAPIPermission]
+
+    admin_api_permission = {"create": AdminAPIEnum.TEMPLATE_CREATE.value}
+
+    template_biz = TemplateBiz()
+    template_check_biz = TemplateCheckBiz()
+
+    @swagger_auto_schema(
+        operation_description="创建模板",
+        request_body=AdminTemplateCreateSLZ(label="模板"),
+        responses={status.HTTP_201_CREATED: AdminTemplateIdSLZ(label="模板ID")},
+        tags=["admin.template"],
+    )
+    @view_audit_decorator(TemplateCreateAuditProvider)
+    def create(self, request, *args, **kwargs):
+        """
+        创建模板
+        """
+        serializer = AdminTemplateCreateSLZ(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        user_id = request.user.username
+        data = serializer.validated_data
+        role = Role.objects.get(type=RoleType.SUPER_MANAGER.value)
+
+        # 检查模板的授权是否满足管理员的授权范围
+        scope_checker = RoleAuthorizationScopeChecker(role)
+        scope_checker.check_actions(data["system_id"], data["action_ids"])
+
+        with gen_template_upsert_lock(role.id, data["name"]):
+            # 检查权限模板是否在角色内唯一
+            self.template_check_biz.check_role_template_name_exists(role.id, data["name"])
+
+            template = self.template_biz.create(role.id, TemplateCreateBean.parse_obj(data), user_id)
+
+        audit_context_setter(template=template)
+
+        return Response({"id": template.id}, status=status.HTTP_201_CREATED)
diff --git a/saas/backend/apps/template/filters.py b/saas/backend/apps/template/filters.py
index 66f56544b..2aa86e423 100644
--- a/saas/backend/apps/template/filters.py
+++ b/saas/backend/apps/template/filters.py
@@ -10,21 +10,20 @@
 """
 from django_filters import rest_framework as filters
 
+from backend.apps.group.models import Group
 from backend.apps.template.models import PermTemplate, PermTemplatePolicyAuthorized
 
 
 class TemplateMemberFilter(filters.FilterSet):
-    types = filters.CharFilter(method="types_filter", label="用户名")
+    name = filters.CharFilter(method="name_filter", label="用户组名")
 
     class Meta:
         model = PermTemplatePolicyAuthorized
-        fields = ["types"]
+        fields = ["name"]
 
-    def types_filter(self, queryset, name, value):
-        types = value.split(",")
-        if types:
-            return queryset.filter(subject_type__in=types)
-        return queryset
+    def name_filter(self, queryset, name, value):
+        group_ids = list(Group.objects.filter(name__icontains=value).values_list("id", flat=True))
+        return queryset.filter(subject_id__in=group_ids)
 
 
 class TemplateFilter(filters.FilterSet):
diff --git a/saas/backend/apps/template/serializers.py b/saas/backend/apps/template/serializers.py
index bf9db18fe..b5a20114d 100644
--- a/saas/backend/apps/template/serializers.py
+++ b/saas/backend/apps/template/serializers.py
@@ -275,3 +275,7 @@ def __init__(self, *args, **kwargs):
 
 class TemplatePreUpdateSchemaSLZ(serializers.Serializer):
     action_ids = serializers.ListField(label="操作策略", child=serializers.CharField(), allow_empty=False)
+
+
+class TemplateGroupSLZ(serializers.Serializer):
+    group_id = serializers.IntegerField(label="用户组id")
diff --git a/saas/backend/apps/template/urls.py b/saas/backend/apps/template/urls.py
index 897887c8f..854cd445f 100644
--- a/saas/backend/apps/template/urls.py
+++ b/saas/backend/apps/template/urls.py
@@ -59,6 +59,12 @@
                     views.TemplateUpdateCommitViewSet.as_view({"post": "create"}),
                     name="template.update_commit",
                 ),
+                # 转换成自定义权限
+                path(
+                    "convert_to_custom_policy/",
+                    views.TemplateConvertToCustomPolicyViewSet.as_view({"post": "create"}),
+                    name="template.convert_to_custom_policy",
+                ),
             ]
         ),
     ),
diff --git a/saas/backend/apps/template/views.py b/saas/backend/apps/template/views.py
index 70c26496d..c5d816504 100644
--- a/saas/backend/apps/template/views.py
+++ b/saas/backend/apps/template/views.py
@@ -25,6 +25,7 @@
 from backend.audit.audit import audit_context_setter, view_audit_decorator
 from backend.biz.action import ActionBiz, ActionCheckBiz, ActionResourceGroupForCheck
 from backend.biz.action_group import ActionGroupBiz
+from backend.biz.policy import PolicyBean, PolicyOperationBiz
 from backend.biz.role import RoleAuthorizationScopeChecker, RoleListQuery, RoleObjectRelationChecker
 from backend.biz.subject import SubjectInfoList
 from backend.biz.template import (
@@ -60,6 +61,7 @@
     TemplateGroupAuthorationPreUpdateSLZ,
     TemplateGroupPreViewSchemaSLZ,
     TemplateGroupPreViewSLZ,
+    TemplateGroupSLZ,
     TemplateIdSLZ,
     TemplateListSchemaSLZ,
     TemplateListSLZ,
@@ -540,3 +542,43 @@ def create(self, request, *args, **kwargs):
         audit_context_setter(template=template)
 
         return Response({})
+
+
+class TemplateConvertToCustomPolicyViewSet(TemplatePermissionMixin, GenericViewSet):
+    """
+    转换成自定义权限
+    """
+
+    lookup_field = "id"
+    queryset = PermTemplate.objects.all()
+
+    policy_biz = PolicyOperationBiz()
+    template_biz = TemplateBiz()
+
+    @swagger_auto_schema(
+        operation_description="模版权限转换成自定义权限",
+        responses={status.HTTP_200_OK: TemplateGroupSLZ()},
+        tags=["template"],
+    )
+    @view_audit_decorator(TemplateMemberDeleteAuditProvider)
+    def create(self, request, *args, **kwargs):
+        template = self.get_object()
+
+        slz = TemplateGroupSLZ(data=request.data)
+        slz.is_valid(raise_exception=True)
+        group_id = slz.validated_data["group_id"]
+
+        # 查询用户组关联的模版权限
+        subject = Subject.from_group_id(group_id)
+        authorized_template = PermTemplatePolicyAuthorized.objects.get_by_subject_template(subject, template.id)
+        template_policies = parse_obj_as(List[PolicyBean], authorized_template.data["actions"])
+
+        # 合并权限, 重新授权自定义权限
+        self.policy_biz.alter(template.system_id, subject, template_policies)
+
+        # 解除用户组与模版直接的关系
+        self.template_biz.revoke_subjects(template.system_id, template.id, [subject])
+
+        audit_context_setter(template=template, members=[subject.dict()])
+
+        return Response({})
diff --git a/saas/backend/trans/open_authorization.py b/saas/backend/trans/open_authorization.py
index 207634a6d..01e8eeff9 100644
--- a/saas/backend/trans/open_authorization.py
+++ b/saas/backend/trans/open_authorization.py
@@ -15,6 +15,7 @@
 from backend.biz.action import ActionBiz
 from backend.biz.policy import PolicyBeanList
 from backend.common.error_codes import error_codes
+from backend.common.time import PERMANENT_SECONDS
 
 from .open import OpenCommonTrans, OpenPolicy
 
@@ -211,7 +212,7 @@ def to_policy_list_for_instances_of_creator(
         for open_policy in open_policies:
             open_policy.fill_instance_name()
 
-        return self._to_policy_list(system_id, open_policies)
+        return self._to_policy_list(system_id, open_policies, expired_at=PERMANENT_SECONDS)
 
     def to_policy_list_for_attributes_of_creator(
         self, system_id: str, action_ids: List[str], resource_type_id: str, attributes: List[Dict]
@@ -240,4 +241,4 @@ def to_policy_list_for_attributes_of_creator(
         # 将数据转换为OpenPolicy用于后续处理
         open_policies = parse_obj_as(List[OpenPolicy], actions)
 
-        return self._to_policy_list(system_id, open_policies)
+        return self._to_policy_list(system_id, open_policies, expired_at=PERMANENT_SECONDS)
diff --git a/saas/poetry.lock b/saas/poetry.lock
index 1fbae9b8d..a294a2c9f 100644
--- a/saas/poetry.lock
+++ b/saas/poetry.lock
@@ -1768,7 +1768,7 @@ python-versions = ">=3.5"
 
 [[package]]
 name = "sentry-sdk"
-version = "1.44.1"
+version = "1.5.6"
 description = "Python client for Sentry (https://sentry.io)"
 category = "main"
 optional = false
@@ -1776,38 +1776,24 @@ python-versions = "*"
 
 [package.dependencies]
 certifi = "*"
-urllib3 = {version = ">=1.26.11", markers = "python_version >= \"3.6\""}
+urllib3 = ">=1.10.0"
 
 [package.extras]
 aiohttp = ["aiohttp (>=3.5)"]
-arq = ["arq (>=0.23)"]
-asyncpg = ["asyncpg (>=0.23)"]
 beam = ["apache-beam (>=2.12)"]
 bottle = ["bottle (>=0.12.13)"]
 celery = ["celery (>=3)"]
-celery-redbeat = ["celery-redbeat (>=2)"]
 chalice = ["chalice (>=1.16.0)"]
-clickhouse-driver = ["clickhouse-driver (>=0.2.0)"]
 django = ["django (>=1.8)"]
 falcon = ["falcon (>=1.4)"]
-fastapi = ["fastapi (>=0.79.0)"]
-flask = ["blinker (>=1.1)", "flask (>=0.11)", "markupsafe"]
-grpcio = ["grpcio (>=1.21.1)"]
+flask = ["blinker (>=1.1)", "flask (>=0.11)"]
 httpx = ["httpx (>=0.16.0)"]
-huey = ["huey (>=2)"]
-loguru = ["loguru (>=0.5)"]
-openai = ["openai (>=1.0.0)", "tiktoken (>=0.3.0)"]
-opentelemetry = ["opentelemetry-distro (>=0.35b0)"]
-opentelemetry-experimental = ["opentelemetry-distro (>=0.40b0,<1.0.0)", "opentelemetry-instrumentation-aiohttp-client (>=0.40b0,<1.0.0)", "opentelemetry-instrumentation-django (>=0.40b0,<1.0.0)", "opentelemetry-instrumentation-fastapi (>=0.40b0,<1.0.0)", "opentelemetry-instrumentation-flask (>=0.40b0,<1.0.0)", "opentelemetry-instrumentation-requests (>=0.40b0,<1.0.0)", "opentelemetry-instrumentation-sqlite3 (>=0.40b0,<1.0.0)", "opentelemetry-instrumentation-urllib (>=0.40b0,<1.0.0)"]
-pure-eval = ["asttokens", "executing", "pure-eval"]
-pymongo = ["pymongo (>=3.1)"]
+pure_eval = ["asttokens", "executing", "pure-eval"]
 pyspark = ["pyspark (>=2.4.4)"]
 quart = ["blinker (>=1.1)", "quart (>=0.16.1)"]
 rq = ["rq (>=0.6)"]
 sanic = ["sanic (>=0.8)"]
 sqlalchemy = ["sqlalchemy (>=1.2)"]
-starlette = ["starlette (>=0.19.1)"]
-starlite = ["starlite (>=1.48)"]
 tornado = ["tornado (>=5)"]
 
 [[package]]
@@ -2073,7 +2059,7 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"]
 [metadata]
 lock-version = "1.1"
 python-versions = "3.6.6"
-content-hash = "89a4481394a7eaac5f6aaa1890d4305d9fd8af594332a68cb7ed53076c0d7481"
+content-hash = "c8a8f658bf82bde36e847d3f5ca4876471b7f5ca2bc752d94d2a1e6110a0512c"
 
 [metadata.files]
 aenum = [
@@ -3216,8 +3202,8 @@ requests = [
     {file = "ruamel.yaml.clib-0.2.6.tar.gz", hash = "sha256:4ff604ce439abb20794f05613c374759ce10e3595d1867764dd1ae675b85acbd"},
 ]
 sentry-sdk = [
-    {file = "sentry-sdk-1.44.1.tar.gz", hash = "sha256:24e6a53eeabffd2f95d952aa35ca52f0f4201d17f820ac9d3ff7244c665aaf68"},
-    {file = "sentry_sdk-1.44.1-py2.py3-none-any.whl", hash = "sha256:5f75eb91d8ab6037c754a87b8501cc581b2827e923682f593bed3539ce5b3999"},
+    {file = "sentry-sdk-1.5.6.tar.gz", hash = "sha256:ac2a50128409d57655279817aedcb7800cace1f76b266f3dd62055d5afd6e098"},
+    {file = "sentry_sdk-1.5.6-py2.py3-none-any.whl", hash = "sha256:1ab34e3851a34aeb3d1af1a0f77cec73978c4e9698e5210d050e4932953cb241"},
 ]
 six = [
     {file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"},
diff --git a/saas/pyproject.toml b/saas/pyproject.toml
index fcb289450..fd4e841bc 100644
--- a/saas/pyproject.toml
+++ b/saas/pyproject.toml
@@ -115,7 +115,7 @@ opentelemetry-instrumentation-celery = "0.27b0"
 opentelemetry-instrumentation-logging = "0.27b0"
 opentelemetry-exporter-jaeger = "1.7.1"
 openpyxl = "^3.0.9"
-sentry-sdk = "1.44.1"
+sentry-sdk = "1.5.6"
 django-environ = "^0.8.1"
 gunicorn = "^20.1.0"
 gevent = "22.10.2"
diff --git a/saas/requirements.txt b/saas/requirements.txt
index 910a9ba4f..cdca4959d 100644
--- a/saas/requirements.txt
+++ b/saas/requirements.txt
@@ -105,7 +105,7 @@ redis==4.3.6; python_version >= "3.6"
 requests==2.27.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0")
 ruamel.yaml.clib==0.2.6; platform_python_implementation == "CPython" and python_version < "3.10" and python_version >= "3.6"
 ruamel.yaml==0.17.10; python_version >= "3.6"
-sentry-sdk==1.44.1
+sentry-sdk==1.5.6
 six==1.15.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")
 smmap==5.0.0; python_version >= "3.6"
 sqlparse==0.4.4; python_version >= "3.5"
diff --git a/saas/requirements_dev.txt b/saas/requirements_dev.txt
index 99c8e7312..c68066f91 100644
--- a/saas/requirements_dev.txt
+++ b/saas/requirements_dev.txt
@@ -137,7 +137,7 @@ regex==2021.8.3; python_full_version >= "3.6.2"
 requests==2.27.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0")
 ruamel.yaml.clib==0.2.6; platform_python_implementation == "CPython" and python_version < "3.10" and python_version >= "3.6"
 ruamel.yaml==0.17.10; python_version >= "3.6"
-sentry-sdk==1.44.1
+sentry-sdk==1.5.6
 six==1.15.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")
 smmap==5.0.0; python_version >= "3.6"
 sqlparse==0.4.4; python_version >= "3.5"
diff --git a/saas/resources/version_log/change_log.md b/saas/resources/version_log/change_log.md
index 62536d277..3946143b7 100644
--- a/saas/resources/version_log/change_log.md
+++ b/saas/resources/version_log/change_log.md
@@ -1,3 +1,13 @@
+<!-- 2024-04-25 -->
+# V1.10.27 版本更新日志
+
+### 缺陷修复
+
+* 系统注册的不可申请操作对「我的管理空间」生效
+* 添加成员支持模糊搜索（解决带登录域无法搜索问题）
+
+---
+
 <!-- 2024-04-12 -->
 # V1.10.26 版本更新日志
 
diff --git a/saas/resources/version_log/change_log_en.md b/saas/resources/version_log/change_log_en.md
index 46faf4878..0dd7b9fa7 100644
--- a/saas/resources/version_log/change_log_en.md
+++ b/saas/resources/version_log/change_log_en.md
@@ -1,3 +1,13 @@
+<!-- 2024-04-25 -->
+# V1.10.27 Version Update Log
+
+### Bug Fixes
+
+* System-registered non-apply operations take effect for "My Management Space"
+* Add support for fuzzy search of members (resolves the issue of not being able to search for users with login domains)
+
+---
+
 <!-- 2024-04-12 -->
 # V1.10.26 Version Update Log