From c5150baa69a764d826742c813ba461c9aa13f2db Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Tue, 12 Aug 2025 18:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=9A=E8=BF=87=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=B4=A6=E5=8F=B7=E9=82=80=E8=AF=B7=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TenantInviteUserModal.vue      | 38 +++++++++++++++----
 .../src/views/system/tenant/index.vue         | 12 ++++--
 .../views/system/tenant/my/MyTenantList.vue   | 36 +++++++++++++++---
 .../src/views/system/tenant/tenant.data.ts    | 22 +++++------
 4 files changed, 79 insertions(+), 29 deletions(-)

diff --git a/jeecgboot-vue3/src/views/system/tenant/components/TenantInviteUserModal.vue b/jeecgboot-vue3/src/views/system/tenant/components/TenantInviteUserModal.vue
index dfa81b1f8..15e21cbbb 100644
--- a/jeecgboot-vue3/src/views/system/tenant/components/TenantInviteUserModal.vue
+++ b/jeecgboot-vue3/src/views/system/tenant/components/TenantInviteUserModal.vue
@@ -19,21 +19,43 @@ export default defineComponent({
     const title = ref<string>('邀请成员');
     const [registerForm, { resetFields, validate }] = useForm({
       schemas: [
+        {
+          label: '邀请方式',
+          field: 'invitedMode',
+          component: 'RadioButtonGroup',
+          defaultValue: 1,
+          componentProps: {
+            options: [
+              { label: '手机号', value: 1 },
+              { label: '用户账号', value: 2 },
+            ],
+          },
+        },
         {
           label: '手机号',
           field: 'phone',
           component: 'Input',
-          dynamicRules: () => {
-            return [
-              { required: true, message: '请填写手机号' },
-              { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' },
-            ];
+          ifShow: ({ values }) => values.invitedMode === 1,
+          dynamicRules: ({ values }) => {
+            return values.invitedMode === 1
+              ? [
+                  { required: true, message: '请填写手机号' },
+                  { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' },
+                ]
+              : [{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' }];
+          },
+        },
+        {
+          field: 'user',
+          component: 'Input',
+          label: '用户账号',
+          ifShow: ({ values }) => values.invitedMode === 2,
+          dynamicRules: ({ values }) => {
+            return values.invitedMode === 2 ? [{ required: true, message: '请输入用户账号' }] : [];
           },
         },
       ],
       showActionButtonGroup: false,
-      labelCol: { span: 24 },
-      wrapperCol: { span: 24 },
     });
     //表单赋值
     const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
@@ -47,7 +69,7 @@ export default defineComponent({
      */
     async function handleSubmit() {
       let values = await validate();
-      emit('inviteOk',values.phone);
+      emit('inviteOk', values.phone, values.user);
       closeModal();
     }
 
diff --git a/jeecgboot-vue3/src/views/system/tenant/index.vue b/jeecgboot-vue3/src/views/system/tenant/index.vue
index 6a150dc4a..03980b219 100644
--- a/jeecgboot-vue3/src/views/system/tenant/index.vue
+++ b/jeecgboot-vue3/src/views/system/tenant/index.vue
@@ -156,12 +156,16 @@
   /**
    * 用户选择回调事件
    * @param options
-   * @param value
+   * @param phone
+   * @param userSelectId
    */
-  async function handleInviteUserOk(value) {
+  async function handleInviteUserOk(phone, username) {
     //update-begin---author:wangshuai ---date:20230314  for：【QQYUN-4605】后台的邀请谁加入租户，没办法选不是租户下的用户------------
-    if (value) {
-      await invitationUserJoin({ ids: selectedRowKeys.value.join(','), phone: value });
+    if (phone) {
+      await invitationUserJoin({ ids: selectedRowKeys.value.join(','), phone: phone });
+    }
+    if (username) {
+      await invitationUserJoin({ ids: selectedRowKeys.value.join(','), username: username });
     }
     //update-end---author:wangshuai ---date:20230314  for：【QQYUN-4605】后台的邀请谁加入租户，没办法选不是租户下的用户------------
   }
diff --git a/jeecgboot-vue3/src/views/system/tenant/my/MyTenantList.vue b/jeecgboot-vue3/src/views/system/tenant/my/MyTenantList.vue
index 39fe2c3c6..b4b8c1612 100644
--- a/jeecgboot-vue3/src/views/system/tenant/my/MyTenantList.vue
+++ b/jeecgboot-vue3/src/views/system/tenant/my/MyTenantList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection" @fetch-success="onFetchSuccess">
       <template #tableTitle>
         <a-button
           preIcon="ant-design:user-add-outlined"
@@ -67,7 +67,7 @@
         fixed: 'right',
       },
       rowSelection:{
-        type: "radio"
+        type: "radio",
       },
       beforeFetch: (params) => {
         return Object.assign(params, { userTenantStatus: '1,3,4' });
@@ -76,6 +76,26 @@
   });
   const [registerTable, { reload }, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
 
+  // 默认选中当前租户
+  function onFetchSuccess(data) {
+    let items = data.items;
+    console.log('items:', items);
+    // 当前登录租户ID
+    let loginTenantId = getTenantId();
+    console.log('loginTenantId:', loginTenantId);
+    // 如果当前登录租户ID在列表中，则默认选中
+    if (items && items.length > 0 && loginTenantId) {
+      for (let i = 0; i < items.length; i++) {
+        if (items[i].id == loginTenantId) {
+          console.log('items[i].id:', items[i].id);
+          selectedRowKeys.value = [items[i].id];
+          selectedRows.value = [items[i]];
+          return;
+        }
+      }
+    }
+  }
+
   /**
    * 操作列定义
    * @param record
@@ -99,11 +119,15 @@
   /**
    * 用户选择回调事件
    * @param options
-   * @param value
+   * @param phone
+   * @param userSelectId
    */
-  async function handleInviteUserOk(value) {
-    if (value) {
-      await invitationUserJoin({ ids: selectedRowKeys.value.join(','), phone: value });
+  async function handleInviteUserOk(phone, username) {
+    if (phone) {
+      await invitationUserJoin({ ids: selectedRowKeys.value.join(','), phone: phone });
+    }
+    if (username) {
+      await invitationUserJoin({ ids: selectedRowKeys.value.join(','), username: username });
     }
   }
 
diff --git a/jeecgboot-vue3/src/views/system/tenant/tenant.data.ts b/jeecgboot-vue3/src/views/system/tenant/tenant.data.ts
index 4ddc619a9..8c5b06102 100644
--- a/jeecgboot-vue3/src/views/system/tenant/tenant.data.ts
+++ b/jeecgboot-vue3/src/views/system/tenant/tenant.data.ts
@@ -40,19 +40,19 @@ export const columns: BasicColumn[] = [
     title: '门牌号',
     width: 100,
   },
-  {
-    dataIndex: 'position_dictText',
-    title: '职级',
-    width: 150
-  },
-  {
-    dataIndex: 'department_dictText',
-    title: '部门',
-    width: 150
-  },
+  // {
+  //   dataIndex: 'position_dictText',
+  //   title: '职级',
+  //   width: 150
+  // },
+  // {
+  //   dataIndex: 'department_dictText',
+  //   title: '部门',
+  //   width: 150
+  // },
   {
     dataIndex: 'createBy_dictText',
-    title: '创建者(拥有者)',
+    title: '创建者(拥有)',
     width: 150
   },
 /*  {