diff --git a/src/views/system/tenant/TenantPackModal.vue b/src/views/system/tenant/TenantPackModal.vue
index ad63655..8397835 100644
--- a/src/views/system/tenant/TenantPackModal.vue
+++ b/src/views/system/tenant/TenantPackModal.vue
@@ -18,9 +18,10 @@
     </BasicTable>
   </BasicModal>
   <TenantPackMenuModal @register="registerPackMenu" @success="success" />
+  <TenantPackUserModal @register="registerPackUser" @success="success" />
 </template>
 <script lang="ts" setup name="tenant-pack-modal">
-  import { ref, unref } from 'vue';
+  import { reactive, ref, unref } from 'vue';
   import { BasicModal, useModal, useModalInner } from '/@/components/Modal';
   import { packColumns, userColumns, packFormSchema } from './tenant.data';
   import { getTenantUserList, leaveTenant, packList, deletePackPermissions } from './tenant.api';
@@ -28,8 +29,11 @@
   import { BasicTable, TableAction } from '/@/components/Table';
   import TenantPackMenuModal from './TenantPackMenuModal.vue';
   import {Modal} from "ant-design-vue";
+  import TenantPackUserModal from './TenantPackUserModal.vue';
+  import {useMessage} from "/@/hooks/web/useMessage";
 
   const [registerPackMenu, { openModal }] = useModal();
+  const [registerPackUser, { openModal: packUserOpenModal }] = useModal();
   const tenantId = ref<number>(0);
   // 列表页面公共参数、方法
   const { prefixCls, tableContext } = useListPage({
@@ -57,12 +61,14 @@
       },
     },
   });
-  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
   // Emits声明
   const emit = defineEmits(['register', 'success']);
+  const createBy = ref<string>('');
   //表单赋值
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     tenantId.value = data.tenantId;
+    createBy.value = data.createBy;
     success();
   });
   //设置标题
@@ -75,6 +81,10 @@
 
   function getActions(record) {
     return [
+      {
+        label: '用户',
+        onClick: seeTenantPackUser.bind(null, record),
+      },
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),
@@ -83,7 +93,7 @@
         label: '删除',
         popConfirm: {
           title: '是否确认删除租户产品包',
-          confirm: handleDelete.bind(null, record.id),
+          confirm: handleDelete.bind(null, record),
         },
       },
     ];
@@ -108,18 +118,37 @@
     });
   }
 
+  //默认系统产品包不允许删除,包含(超级管理员、组织账户管理员、组织应用管理员)
+  const packCode = reactive<any>(['superAdmin','accountAdmin','appAdmin']);
+  const { createMessage } = useMessage();
+  
   /**
    * 删除产品包
    * @param 删除
    */
-  async function handleDelete(id) {
-    await deletePackPermissions({ ids: id }, success);
+  async function handleDelete(record) {
+    //update-begin---author:wangshuai ---date:20230222  for：系统默认产品包不允许删除------------
+    if(packCode.indexOf(record.packCode) != -1){
+        createMessage.warning("默认系统产品包不允许删除");
+       return;
+    }
+    //update-end---author:wangshuai ---date:20230222  for：系统默认产品包不允许删除------------
+    await deletePackPermissions({ ids: record.id }, success);
   }
 
   /**
    * 批量删除产品包
    */
   async function handlePackBatch() {
+    let value = selectedRows.value;
+    if(value && value.length>0){
+      for (let i = 0; i < value.length; i++) {
+        if(packCode.indexOf(value[i].packCode) != -1){
+          createMessage.warning("默认系统产品包不允许删除");
+          return;
+        }
+      }
+    }
     Modal.confirm({
       title: '删除租户产品包',
       content: '是否删除租户产品包',
@@ -141,4 +170,15 @@
       tenantId: unref(tenantId),
     });
   }
+
+  /**
+   * 产品包下面的用户
+   * @param record
+   */
+  function seeTenantPackUser(record) {
+    record.createBy = unref(createBy);
+    packUserOpenModal(true,{
+      record:record
+    })
+  }
 </script>
diff --git a/src/views/system/tenant/TenantPackUserModal.vue b/src/views/system/tenant/TenantPackUserModal.vue
new file mode 100644
index 0000000..3c9da65
--- /dev/null
+++ b/src/views/system/tenant/TenantPackUserModal.vue
@@ -0,0 +1,173 @@
+<template>
+  <BasicModal @register="registerModal" destroyOnClose :title="title" :width="1000" @ok="handleSubmit">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #departNames="{ text, record }">
+        <template v-if="text && text.length > 0">
+          {{ getName(text) }}
+        </template>
+      </template>
+      <template #positionNames="{ text, record }">
+        <template v-if="text && text.length > 0">
+          {{ getName(text) }}
+        </template>
+      </template>
+      <template #tableTitle>
+        <a-button preIcon="ant-design:usergroup-add-outlined" type="primary" @click="addUser">邀请成员</a-button>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+    </BasicTable>
+    <user-select-modal :multi="true" @register="registerUserModal" @selected="onSelected"></user-select-modal>
+  </BasicModal>
+</template>
+
+<script lang="ts">
+  import { defineComponent, reactive, ref } from 'vue';
+  import { BasicModal, useModal, useModalInner } from '/@/components/Modal';
+  import { BasicTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { tenantPackUserColumns } from './tenant.data';
+  import { queryTenantPackUserList, deleteTenantPackUser, addTenantPackUser } from './tenant.api';
+  import UserSelectModal from '/@/components/Form/src/jeecg/components/userSelect/UserSelectModal.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useUserStore } from '/@/store/modules/user';
+
+  export default defineComponent({
+    name: 'TenantPackUserModal',
+    components: { BasicModal, BasicTable, TableAction, UserSelectModal },
+    setup() {
+      //产品包信息
+      const tenantPackData = reactive<any>({});
+      //表单赋值
+      const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+        setModalProps({ confirmLoading: false, showCancelBtn: true, showOkBtn: false });
+        Object.assign(tenantPackData, data.record);
+        await reload();
+      });
+      const { createMessage } = useMessage();
+      //设置标题
+      const title = ref<string>('用户');
+      //注册table数据
+      const { tableContext } = useListPage({
+        tableProps: {
+          api: queryTenantPackUserList,
+          immediate: false,
+          columns: tenantPackUserColumns,
+          canResize: false,
+          useSearchForm: false,
+          beforeFetch: (params) => {
+            params.tenantId = tenantPackData.tenantId;
+            params.packId = tenantPackData.id;
+            params.status = 1;
+            return params;
+          },
+          actionColumn: {
+            width: 120,
+            fixed: 'right',
+          },
+        },
+      });
+      const [registerUserModal, { openModal: openUserModal, closeModal: closeUserModal }] = useModal();
+      const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+
+      /**
+       * 获取部门/职务名称
+       * @param value
+       */
+      function getName(value) {
+        return value.join(',');
+      }
+
+      /**
+       * 表格操作列
+       * @param record
+       */
+      function getTableAction(record) {
+        const userStore = useUserStore();
+        let username = userStore.getUserInfo.username;
+        if (username != tenantPackData.createBy) {
+        }
+        return [
+          {
+            label: '移除',
+            popConfirm: {
+              title: '是否确认移除',
+              confirm: handleDelete.bind(null, record),
+            },
+            ifShow: username == tenantPackData.createBy,
+          },
+          {
+            label: '---',
+            ifShow: username != tenantPackData.createBy,
+          },
+        ];
+      }
+
+      /**
+       * 删除
+       */
+      async function handleDelete(record) {
+        let params = {
+          packId: record.packId,
+          packName: record.packName,
+          tenantId: record.tenantId,
+          userId: record.id,
+          realname: record.realname,
+        };
+        await deleteTenantPackUser(params);
+        await reload();
+      }
+
+      /**
+       * 添加用户弹窗
+       */
+      function addUser() {
+        openUserModal(true, {
+          list: [],
+        });
+      }
+
+      /**
+       * 邀请人回调事件
+       * @param arr
+       */
+      async function onSelected(arr) {
+        if (arr && arr.length > 0) {
+          let names: any[] = [];
+          let ids: any[] = [];
+          for (let u of arr) {
+            names.push(u.realname);
+            ids.push(u.id);
+          }
+          console.log(tenantPackData);
+          let params = {
+            packId: tenantPackData.id,
+            packName: tenantPackData.packName,
+            tenantId: tenantPackData.tenantId,
+            userId: ids.join(','),
+            realname: names.join(','),
+          };
+          await addTenantPackUser(params);
+          await reload();
+        }
+        closeUserModal();
+      }
+
+      return {
+        title,
+        registerModal,
+        registerTable,
+        rowSelection,
+        getName,
+        getTableAction,
+        registerUserModal,
+        addUser,
+        onSelected,
+      };
+    },
+  });
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 7dca935..2f8d6fd 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -86,7 +86,7 @@
       }
     },
   });
-  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
 
   /**
    * 操作列定义
@@ -186,6 +186,8 @@
     }
     packModal(true, {
       tenantId: unref(selectedRowKeys.value.join(',')),
+      //将租户创建人(拥有者)传递过去，产品包下的用户不允许非拥有者删除
+      createBy: selectedRows.value[0].createBy
     });
   }
 
diff --git a/src/views/system/tenant/tenant.api.ts b/src/views/system/tenant/tenant.api.ts
index 2ac4a05..ca2d6d3 100644
--- a/src/views/system/tenant/tenant.api.ts
+++ b/src/views/system/tenant/tenant.api.ts
@@ -19,6 +19,10 @@ enum Api {
   recycleBinPageList = '/sys/tenant/recycleBinPageList',
   deleteLogicDeleted = '/sys/tenant/deleteLogicDeleted',
   revertTenantLogic = '/sys/tenant/revertTenantLogic',
+  //用户产品包关系api
+  queryTenantPackUserList = '/sys/tenant/queryTenantPackUserList',
+  deleteTenantPackUser = '/sys/tenant/deleteTenantPackUser',
+  addTenantPackUser = '/sys/tenant/addTenantPackUser',
 }
 
 /**
@@ -174,3 +178,27 @@ export const revertTenantLogic = (params,handleSuccess) => {
     handleSuccess();
   })
 };
+
+/**
+ * 获取租户产品包下面的用户
+ * @param params
+ */
+export const queryTenantPackUserList = (params) => {
+  return defHttp.get({ url: Api.queryTenantPackUserList, params });
+};
+
+/**
+ * 移除用户和产品包的关系数据
+ * @param params
+ */
+export const deleteTenantPackUser = (params)=>{
+  return defHttp.put({ url: Api.deleteTenantPackUser, params });
+}
+
+/**
+ * 添加用户和产品包的关系数据
+ * @param params
+ */
+export const addTenantPackUser = (params)=>{
+  return defHttp.post({ url: Api.addTenantPackUser, params });
+}
diff --git a/src/views/system/tenant/tenant.data.ts b/src/views/system/tenant/tenant.data.ts
index b3367ff..12176c8 100644
--- a/src/views/system/tenant/tenant.data.ts
+++ b/src/views/system/tenant/tenant.data.ts
@@ -49,6 +49,11 @@ export const columns: BasicColumn[] = [
     title: '部门',
     width: 150
   },
+  {
+    dataIndex: 'createBy_dictText',
+    title: '创建者(拥有者)',
+    width: 150
+  },
 /*  {
     title: '开始时间',
     dataIndex: 'beginDate',
@@ -300,6 +305,7 @@ export const packMenuFormSchema: FormSchema[] = [
       pidField: 'parent_id',
       multiple: true,
       treeCheckAble:true,
+      treeCheckStrictly: true,
       getPopupContainer: () => document.body,
     },
   },
@@ -372,3 +378,26 @@ export const searchRecycleFormSchema : FormSchema[] = [
     component: 'Input',
   },
 ]
+
+//产品包用户列表
+export const tenantPackUserColumns: BasicColumn[] = [
+  {
+    title: '用户',
+    dataIndex: 'realname',
+    width: 200,
+  },
+  {
+    title: '部门',
+    dataIndex: 'departNames',
+    width: 200,
+    ellipsis: true,
+    slots: { customRender: 'departNames' }
+  },
+  {
+    title: '职位',
+    dataIndex: 'positionNames',
+    ellipsis: true,
+    width: 200,
+    slots: { customRender: 'positionNames' }
+  }
+]