diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/IotCarbonEnterpriseAuthServiceImpl.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/IotCarbonEnterpriseAuthServiceImpl.java index 4d8840a..7cd5864 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/IotCarbonEnterpriseAuthServiceImpl.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/IotCarbonEnterpriseAuthServiceImpl.java @@ -88,8 +88,9 @@ public class IotCarbonEnterpriseAuthServiceImpl extends BaseServiceImpl menuIdList = sysRoleMenuService.getMenuIdList(roleId); TenantDetailForm.TenantRole role = new TenantDetailForm.TenantRole(); - role.setDefaultRole(false); + role.setDefaultRole(true); role.setMenuIdList(menuIdList); + role.setRoleId(roleId); detailForm.setTenantRole(role); sysTenantDetailService.saveDetail(detailForm, CollectionUtil.newArrayList(TenantSaveType.base, TenantSaveType.user, TenantSaveType.menu)); diff --git a/modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java b/modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java index 4e7cf00..5b1976c 100644 --- a/modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java @@ -442,6 +442,7 @@ public class SysTenantDetailServiceImpl extends BaseServiceImpl