From b1646437bc2da18faa6464118bbbf4a55d4a1b62 Mon Sep 17 00:00:00 2001
From: PIG AI <wangiegie@gmail.com>
Date: Tue, 1 Jul 2025 09:21:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(tenant):=20=E5=AE=8C=E5=96=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=B3=A8=E5=86=8C=E6=97=B6tenantId=E7=9A=84=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=A1=AB=E5=85=85=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在RegisterUserDTO中新增tenantId字段用于接收前端传入的租户ID
- 修改SysUserServiceImpl中用户注册逻辑，支持自动继承当前登录用户的tenantId
- 调整SysUserMapper.xml查询条件，允许查询未分配tenantId的用户
---
 .../com/pig4cloud/pigx/admin/api/dto/RegisterUserDTO.java | 5 +++++
 .../pigx/admin/service/impl/SysUserServiceImpl.java       | 3 ++-
 .../src/main/resources/mapper/SysUserMapper.xml           | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/RegisterUserDTO.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/RegisterUserDTO.java
index 439e5f533..e6a20721d 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/RegisterUserDTO.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/RegisterUserDTO.java
@@ -30,4 +30,9 @@ public class RegisterUserDTO {
      * 电话
      */
     private String phone;
+
+    /**
+     * 租户ID
+     */
+    private Long tenantId;
 }
diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java
index 8657e747f..e8fe73386 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java
@@ -156,7 +156,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         // 插入用户租户关系表
         SysTenantUser sysTenantUser = new SysTenantUser();
         sysTenantUser.setUserId(sysUser.getUserId());
-        sysTenantUser.setTenantId(SecurityUtils.getUser().getTenantId());
+        sysTenantUser.setTenantId(Objects.nonNull(SecurityUtils.getUser())
+                ? SecurityUtils.getUser().getTenantId() : userDto.getTenantId());
         sysTenantUserMapper.insert(sysTenantUser);
         return Boolean.TRUE;
     }
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
index 420dccd1a..a4a9a13cc 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -111,9 +111,9 @@
         <include refid="userColumns"/>
         FROM
         sys_user u
-        INNER JOIN sys_user_dept ud ON u.user_id = ud.user_id
+        LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
         WHERE
-        ud.tenant_id = #{query.tenantId}
+        ud.tenant_id = #{query.tenantId} OR ud.tenant_id IS NULL
         AND u.del_flag = '0'
         <!-- 用户名模糊查询 -->
             <if test="query.username != null and query.username != ''">
@@ -138,9 +138,9 @@
         <include refid="userColumns"/>
         FROM
         sys_user u
-        INNER JOIN sys_user_dept ud ON u.user_id = ud.user_id
+        LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
         WHERE
-        ud.tenant_id = #{query.tenantId}
+        ud.tenant_id = #{query.tenantId} OR ud.tenant_id IS NULL
         AND u.del_flag = '0'
         <!-- 用户名模糊查询 -->
             <if test="query.username != null and query.username != ''">