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

---
 .../controller/SysTenantController.java       |  7 ++++--
 .../system/service/ISysTenantService.java     |  3 ++-
 .../service/impl/SysTenantServiceImpl.java    | 24 ++++++++++++++-----
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java
index 2bde5fddd..a6def334c 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java
@@ -412,8 +412,11 @@ public class SysTenantController {
      */
     @PutMapping("/invitationUserJoin")
     @RequiresPermissions("system:tenant:invitation:user")
-    public Result<String> invitationUserJoin(@RequestParam("ids") String ids,@RequestParam("phone") String phone){
-        sysTenantService.invitationUserJoin(ids,phone);
+    public Result<String> invitationUserJoin(@RequestParam("ids") String ids,@RequestParam(value = "phone", required = false) String phone, @RequestParam(value = "username", required = false) String username){
+        if(oConvertUtils.isEmpty(phone) && oConvertUtils.isEmpty(username)){
+            return Result.error("手机号和用户账号不能同时为空！");
+        }
+        sysTenantService.invitationUserJoin(ids,phone,username);
         return Result.ok("邀请用户成功");
     }
 
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java
index f4c79aaad..12b42e04b 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysTenantService.java
@@ -49,8 +49,9 @@ public interface ISysTenantService extends IService<SysTenant> {
      * 邀请用户加入租户,通过手机号
      * @param ids
      * @param phone
+     * @param username
      */
-    void invitationUserJoin(String ids, String phone);
+    void invitationUserJoin(String ids, String phone,String username);
 
     /**
      * 请离用户（租户）
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java
index 4b7d47598..007586b3f 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java
@@ -104,15 +104,27 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 
     @Override
     @CacheEvict(value={CacheConstant.SYS_USERS_CACHE}, allEntries=true)
-    public void invitationUserJoin(String ids, String phone) {
+    public void invitationUserJoin(String ids, String phone,String username) {
         String[] idArray = ids.split(SymbolConstant.COMMA);
+        String userId = null;
+        SysUser userByPhone = null;
         //update-begin---author:wangshuai ---date:20230313  for：【QQYUN-4605】后台的邀请谁加入租户，没办法选不是租户下的用户，通过手机号邀请------------
-        SysUser userByPhone = userService.getUserByPhone(phone);
-        //说明用户不存在
-        if(null == userByPhone){
-            throw new JeecgBootException("当前用户不存在，请核对手机号");
+        if(oConvertUtils.isNotEmpty(phone)){
+            userByPhone = userService.getUserByPhone(phone);
+            //说明用户不存在
+            if(null == userByPhone){
+                throw new JeecgBootException("当前用户不存在，请核对手机号");
+            }
+            userId = userByPhone.getId();
+        }else{
+            userByPhone = userService.getUserByName(username);
+            //说明用户不存在
+            if(null == userByPhone){
+                throw new JeecgBootException("当前用户不存在，请核对手机号");
+            }
+            userId = userByPhone.getId();
         }
-        String userId = userByPhone.getId();
+
         //循环租户id
         for (String id:idArray) {
             //update-begin---author:wangshuai ---date:20221223  for：[QQYUN-3371]租户逻辑改造，改成关系表------------