租户删除

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java

@@ -17,4 +17,7 @@ public interface SysTenantMapper extends BaseMapperPlus<SysTenant, SysTenantVo>
 
     @InterceptorIgnore(tenantLine = "true", dataPermission = "false")
     List<SysTenantVo> selectVoListByUserName(Long userId);
+
+    @InterceptorIgnore(tenantLine = "true", dataPermission = "false")
+    SysTenant selectSysTenantById(Long id);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java

@@ -402,7 +402,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
         }
         for (Long id : ids) {
             //查询租户信息
-            SysTenant tenant = MapstructUtils.convert(id, SysTenant.class);
+            SysTenant tenant = baseMapper.selectSysTenantById(id);
             //删除租户管理员账号，判断账号是否只有一个租户
             List<SysUser> userList = userMapper.selectUserByTenant(tenant.getTenantId(),TENANT_ADMIN_ROLE_KEY);
             for (SysUser sysUser : userList) {

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml

@@ -12,4 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join sys_user_tenant s on t.tenant_id = s.tenant_id
         where t.del_flag = '0' and s.user_id = #{userId}
     </select>
+    <select id="selectSysTenantById" resultMap="SysTenantResult">
+        select id, tenant_id, contact_user_name, contact_phone, company_name, license_number, address, intro, domain, remark, package_id, expire_time, account_count, status, del_flag, create_dept, create_by, create_time, update_by, update_time
+        from sys_tenant
+        where id = #{id}
+    </select>
 </mapper>