From a954c49910263517b5a5809b0c9f802a83b747e0 Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Tue, 24 Dec 2024 17:37:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=AD=E4=BB=A3=EF=BC=8C=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pub/service/impl/IotCarbonEnterpriseAuthServiceImpl.java   | 3 ++-
 .../sys/tenant/service/impl/SysTenantDetailServiceImpl.java    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

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<IotCarbo
         detailForm.setTenantUser(tenantUser);
         List<Long> 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<SysTenantDetailM
             thingCache.updateAccurateKeyEntity(CacheNameEnum.THING_MODEL,
                     modelEntity.getCode()+CacheInit.KEY+modelEntity.getId(),ConvertUtils.sourceToTarget(modelEntity, ModelDetailDTO.class));
         } catch (Exception e) {
+            e.printStackTrace();
             throw new SysException("保存失败,请检查数据源配置");
         }
         //保存分配物及企业物至物实体表