Commit 631bfa8a517fd1a8f7c555951c30c0f5d3770d8e

Authored by 云中非
1 parent dff38f06

fix: 有场景联动关联组织时,不能删除组织

@@ -17,10 +17,7 @@ import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO; @@ -17,10 +17,7 @@ import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
17 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils; 17 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
18 import org.thingsboard.server.common.data.yunteng.utils.tree.TreeUtils; 18 import org.thingsboard.server.common.data.yunteng.utils.tree.TreeUtils;
19 import org.thingsboard.server.dao.yunteng.entities.*; 19 import org.thingsboard.server.dao.yunteng.entities.*;
20 -import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;  
21 -import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;  
22 -import org.thingsboard.server.dao.yunteng.mapper.UserMapper;  
23 -import org.thingsboard.server.dao.yunteng.mapper.UserOrganizationMappingMapper; 20 +import org.thingsboard.server.dao.yunteng.mapper.*;
24 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService; 21 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
25 import org.thingsboard.server.dao.yunteng.service.YtOrganizationService; 22 import org.thingsboard.server.dao.yunteng.service.YtOrganizationService;
26 23
@@ -35,6 +32,7 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM @@ -35,6 +32,7 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
35 private final UserOrganizationMappingMapper userOrganizationMappingMapper; 32 private final UserOrganizationMappingMapper userOrganizationMappingMapper;
36 private final UserMapper userMapper; 33 private final UserMapper userMapper;
37 private final DeviceMapper deviceMapper; 34 private final DeviceMapper deviceMapper;
  35 + private final SceneLinkageMapper sceneMapper;
38 36
39 @Override 37 @Override
40 @Transactional 38 @Transactional
@@ -115,6 +113,10 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM @@ -115,6 +113,10 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
115 if (!userOrganizationMappingList.isEmpty()) { 113 if (!userOrganizationMappingList.isEmpty()) {
116 throw new YtDataValidationException("待删除数据存在关联用户,不能删除!"); 114 throw new YtDataValidationException("待删除数据存在关联用户,不能删除!");
117 } 115 }
  116 + if(sceneMapper.selectCount(new QueryWrapper<SceneLinkage>().lambda().in(SceneLinkage::getOrganizationId,ids)) >0 ){
  117 + throw new YtDataValidationException(ErrorMessage.ORGANIZATION_EXISTED_SCENE_REACT.getMessage());
  118 + }
  119 +
118 // 查询是否有设备使用该组织 120 // 查询是否有设备使用该组织
119 for (String id : ids) { 121 for (String id : ids) {
120 List<YtDevice> deviceList = 122 List<YtDevice> deviceList =