From cab73d9ce0754898cce0494cefa53a76cffc1932 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Thu, 29 Aug 2024 10:31:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=96=B0=E5=A2=9E=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=88=90=E5=8A=9F=202024=E5=B9=B48=E6=9C=8829?=
 =?UTF-8?q?=E6=97=A510:31:52?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/tenant/service/impl/SysTenantDetailServiceImpl.java    | 3 +--
 .../thing/thing/dict/service/impl/IotThingDictServiceImpl.java | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

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 333e6e9..90461bb 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
@@ -414,7 +414,6 @@ public class SysTenantDetailServiceImpl extends BaseServiceImpl<SysTenantDetailM
             // 保存企业物至物管理表
             thingManageContextService.saveModel(Collections.singletonList(thingCode));
         } catch (Exception e) {
-            e.printStackTrace();
             throw new SysException("保存失败,请检查数据源配置");
         }
         //保存分配物及企业物至物实体表
@@ -427,7 +426,7 @@ public class SysTenantDetailServiceImpl extends BaseServiceImpl<SysTenantDetailM
                         .setTemplateMark(TemplateMark.NO.getValue())
                         .setType("企业物")
         );
-        thingManageContextService.saveEntity(thingTenantList);
+        thingManageContextService.batchSaveOrUpdateEntity(thingTenantList);
         //分配企业
         if (typeList.contains(TenantSaveType.comp)) {
             List<Long> tenantCodeList = detailForm.getTenantCodeList();
diff --git a/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java
index 87c9ee1..139ca07 100644
--- a/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java
@@ -138,6 +138,7 @@ public class IotThingDictServiceImpl extends BaseServiceImpl<IotThingDictMapper,
         if(Objects.isNull(iotThingDictDTO)){
             return mapper.selectOneByQueryAs(QueryWrapper.create()
                             .eq(IotThingDictEntity::getCode, code)
+                            .eq(IotThingDictEntity::getGroupName, groupName)
                             .eq(IotThingDictEntity::getIsDefault, 0),
                     IotThingDictDTO.class);
         }