Commit 1b47cb7a by huangjy

fix:新增租户问题

parent 34f1def9
...@@ -8,6 +8,7 @@ import com.makeit.common.entity.BaseBusEntity; ...@@ -8,6 +8,7 @@ import com.makeit.common.entity.BaseBusEntity;
import com.makeit.common.entity.BaseEntity; import com.makeit.common.entity.BaseEntity;
import com.makeit.common.page.PageReqDTO; import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO; import com.makeit.common.page.PageVO;
import com.makeit.dto.platform.sys.PlatLogoConfigDTO;
import com.makeit.entity.platform.auth.PlatOrg; import com.makeit.entity.platform.auth.PlatOrg;
import com.makeit.entity.platform.auth.PlatUser; import com.makeit.entity.platform.auth.PlatUser;
import com.makeit.entity.saas.PlatTenant; import com.makeit.entity.saas.PlatTenant;
...@@ -30,6 +31,7 @@ import com.makeit.module.iot.vo.OrganizationEntity; ...@@ -30,6 +31,7 @@ import com.makeit.module.iot.vo.OrganizationEntity;
import com.makeit.module.system.service.SysConfigService; import com.makeit.module.system.service.SysConfigService;
import com.makeit.service.platform.auth.PlatOrgService; import com.makeit.service.platform.auth.PlatOrgService;
import com.makeit.service.platform.auth.PlatUserService; import com.makeit.service.platform.auth.PlatUserService;
import com.makeit.service.platform.sys.PlatLogoConfigService;
import com.makeit.service.saas.PlatTenantMenuService; import com.makeit.service.saas.PlatTenantMenuService;
import com.makeit.service.saas.PlatTenantService; import com.makeit.service.saas.PlatTenantService;
import com.makeit.service.saas.SaasUserService; import com.makeit.service.saas.SaasUserService;
...@@ -81,6 +83,8 @@ public class PlatTenantServiceImpl extends ServiceImpl<PlatTenantMapper, PlatTen ...@@ -81,6 +83,8 @@ public class PlatTenantServiceImpl extends ServiceImpl<PlatTenantMapper, PlatTen
@Autowired @Autowired
private IotOrgService iotOrgService; private IotOrgService iotOrgService;
@Autowired
private PlatLogoConfigService platLogoConfigService;
private LambdaQueryWrapper<PlatTenant> listLambdaQueryWrapper(PlatTenantVO dto, boolean userAccountLike) { private LambdaQueryWrapper<PlatTenant> listLambdaQueryWrapper(PlatTenantVO dto, boolean userAccountLike) {
...@@ -272,6 +276,10 @@ public class PlatTenantServiceImpl extends ServiceImpl<PlatTenantMapper, PlatTen ...@@ -272,6 +276,10 @@ public class PlatTenantServiceImpl extends ServiceImpl<PlatTenantMapper, PlatTen
PlatOrg platOrg = convertToPlatOrg(tntTenant); PlatOrg platOrg = convertToPlatOrg(tntTenant);
platOrgService.saveOrg(platOrg); platOrgService.saveOrg(platOrg);
PlatLogoConfigDTO platLogoConfigDTO = new PlatLogoConfigDTO();
platLogoConfigDTO.setCode(dto.getCode());
platLogoConfigDTO.setName(dto.getName());
platLogoConfigService.add(platLogoConfigDTO);
//分配菜单 //分配菜单
assignMenuList(tntTenant.getId(), dto.getMenuIdList()); assignMenuList(tntTenant.getId(), dto.getMenuIdList());
return tntTenant.getId(); return tntTenant.getId();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment