简柏林 / thingskit · Commits

Commit 5d102fa765aa535d003c01778714465c8a086b0d

Authored by 黄 x
1 parent a107f260

fix: 删除租户时，要删除租户的企业信息

Inline Side-by-side
Showing 2 changed files with 5 additions and 2 deletions
@@ -52,6 +52,7 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan @@ -52,6 +52,7 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan
52 private final ConvertConfigService convertConfigService; 52 private final ConvertConfigService convertConfigService;
53 private final SysAppDesignService sysAppDesignService; 53 private final SysAppDesignService sysAppDesignService;
54 private final SysPlatformDesignService sysPlatformDesignService; 54 private final SysPlatformDesignService sysPlatformDesignService;
  55 + private final SysEnterpriseService sysEnterpriseService;
55 @Override 56 @Override
56 @Transactional 57 @Transactional
57 public TenantDTO createNewTenant(TenantReqDTO tenantReqDTO) { 58 public TenantDTO createNewTenant(TenantReqDTO tenantReqDTO) {
@@ -154,9 +155,10 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan @@ -154,9 +155,10 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan
154 sceneLinkageService.deleteDataByTenantIds(tenantIds); 155 sceneLinkageService.deleteDataByTenantIds(tenantIds);
155 // 13.DELETE CONVERT_CONFIG 156 // 13.DELETE CONVERT_CONFIG
156 convertConfigService.deleteDataByTenantIds(tenantIds); 157 convertConfigService.deleteDataByTenantIds(tenantIds);
157 - // 14.DELETE APP_DESIGN PLATFORM_DESIGN 158 + // 14.DELETE APP_DESIGN PLATFORM_DESIGN ENTERPRISE
158 sysAppDesignService.deleteDataByTenantIds(tenantIds); 159 sysAppDesignService.deleteDataByTenantIds(tenantIds);
159 sysPlatformDesignService.deleteDataByTenantIds(tenantIds); 160 sysPlatformDesignService.deleteDataByTenantIds(tenantIds);
  161 + sysEnterpriseService.deleteDataByTenantIds(tenantIds);
160 // 15.DELETE TENANT_ROLE、TENANT_MENU 162 // 15.DELETE TENANT_ROLE、TENANT_MENU
161 deleteTenantRolesByTenantId(tenantIds); 163 deleteTenantRolesByTenantId(tenantIds);
162 deleteTenantMenusByTenantId(tenantIds); 164 deleteTenantMenusByTenantId(tenantIds);
@@ -2,13 +2,14 @@ package org.thingsboard.server.dao.yunteng.service; @@ -2,13 +2,14 @@ package org.thingsboard.server.dao.yunteng.service;
2 2
3 3
4 import org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO; 4 import org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO;
  5 +import org.thingsboard.server.dao.yunteng.entities.SysEnterprise;
5 6
6 /** 7 /**
7 * @author: 徐浩然 8 * @author: 徐浩然
8 * @desc: 9 * @desc:
9 * @date: 2021/12/3-18:39 10 * @date: 2021/12/3-18:39
10 */ 11 */
11 -public interface SysEnterpriseService { 12 +public interface SysEnterpriseService extends BaseService<SysEnterprise>{
12 boolean save(SysEnterpriseDTO sysEnterpriseDTO,String tenantId); 13 boolean save(SysEnterpriseDTO sysEnterpriseDTO,String tenantId);
13 14
14 SysEnterpriseDTO get(String tenantId); 15 SysEnterpriseDTO get(String tenantId);