简柏林 / thingskit · Commits

Commit 178bc5812be52b9a1f1ce5490b55af9c422f4a06

Authored by 黄 x
1 parent c7235c2d

fix: 字典删除错误BUG

Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
@@ -51,7 +51,7 @@ public enum ErrorMessage { @@ -51,7 +51,7 @@ public enum ErrorMessage {
51 ORGANIZATION_DEVICE_NOT_MATCHED_IN_ACTION(400032,"动作中存在设备不属于场景联动所在组织"), 51 ORGANIZATION_DEVICE_NOT_MATCHED_IN_ACTION(400032,"动作中存在设备不属于场景联动所在组织"),
52 ORGANIZATION_EXISTED_SCENE_REACT(400033,"组织被场景联动使用中"), 52 ORGANIZATION_EXISTED_SCENE_REACT(400033,"组织被场景联动使用中"),
53 ORGANIZATION_EXISTED_ALARM_CONTACT(400034,"组织被告警联系人使用中"), 53 ORGANIZATION_EXISTED_ALARM_CONTACT(400034,"组织被告警联系人使用中"),
54 - 54 + EXIST_LEADER_MEMBER_RELATION(400035,"上下级之间有一种关系"),
55 HAVE_NO_PERMISSION(500002,"没有修改权限"); 55 HAVE_NO_PERMISSION(500002,"没有修改权限");
56 private final int code; 56 private final int code;
57 private String message; 57 private String message;
1 package org.thingsboard.server.dao.yunteng.impl; 1 package org.thingsboard.server.dao.yunteng.impl;
  2 +
2 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3 import com.baomidou.mybatisplus.core.metadata.IPage; 4 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import lombok.RequiredArgsConstructor; 5 import lombok.RequiredArgsConstructor;
5 import lombok.extern.slf4j.Slf4j; 6 import lombok.extern.slf4j.Slf4j;
6 import org.springframework.stereotype.Service; 7 import org.springframework.stereotype.Service;
7 import org.springframework.transaction.annotation.Transactional; 8 import org.springframework.transaction.annotation.Transactional;
  9 +import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
8 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException; 10 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
9 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage; 11 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
10 import org.thingsboard.server.common.data.yunteng.dto.SysDictDTO; 12 import org.thingsboard.server.common.data.yunteng.dto.SysDictDTO;
@@ -48,7 +50,7 @@ public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDi @@ -48,7 +50,7 @@ public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDi
48 50
49 @Override 51 @Override
50 @Transactional 52 @Transactional
51 - public SysDictDTO saveSysDict(SysDictDTO sysDictDTO,String tenantId) { 53 + public SysDictDTO saveSysDict(SysDictDTO sysDictDTO, String tenantId) {
52 // 新增之前先判断该租户是否已添加 54 // 新增之前先判断该租户是否已添加
53 SysDictDTO querySysDict = baseMapper.getDictInfoByCode(tenantId, sysDictDTO.getDictCode()); 55 SysDictDTO querySysDict = baseMapper.getDictInfoByCode(tenantId, sysDictDTO.getDictCode());
54 if (querySysDict != null) { 56 if (querySysDict != null) {
@@ -66,11 +68,9 @@ public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDi @@ -66,11 +68,9 @@ public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDi
66 @Transactional 68 @Transactional
67 public boolean deleteSysDict(Set<String> sysDictIds) { 69 public boolean deleteSysDict(Set<String> sysDictIds) {
68 for (String id : sysDictIds) { 70 for (String id : sysDictIds) {
69 - List<SysDictItemDTO> sysDictItemDTO =  
70 - sysDictItemMapper.getDictItemInfo(id,null);  
71 - if (sysDictItemDTO != null) {  
72 - throw new YtDataValidationException(  
73 - "There is a relationship between superiors and subordinates"); 71 + List<SysDictItemDTO> sysDictItemDTO = sysDictItemMapper.getDictItemInfo(id, null);
  72 + if (sysDictItemDTO != null && sysDictItemDTO.size() > FastIotConstants.MagicNumber.ZERO) {
  73 + throw new YtDataValidationException(ErrorMessage.EXIST_LEADER_MEMBER_RELATION.getMessage());
74 } 74 }
75 } 75 }
76 return baseMapper.deleteBatchIds(sysDictIds) > 0; 76 return baseMapper.deleteBatchIds(sysDictIds) > 0;
@@ -78,7 +78,7 @@ public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDi @@ -78,7 +78,7 @@ public class SysDictServiceImpl extends AbstractBaseService<SysDictMapper, SysDi
78 78
79 @Override 79 @Override
80 @Transactional 80 @Transactional
81 - public SysDictDTO updateSysDict(SysDictDTO sysDictDTO,String tenantId) { 81 + public SysDictDTO updateSysDict(SysDictDTO sysDictDTO, String tenantId) {
82 SysDict sysDict = baseMapper.selectById(sysDictDTO.getId()); 82 SysDict sysDict = baseMapper.selectById(sysDictDTO.getId());
83 sysDictDTO.copyToEntity(sysDict); 83 sysDictDTO.copyToEntity(sysDict);
84 sysDict.setTenantId(tenantId); 84 sysDict.setTenantId(tenantId);