Merge remote-tracking branch 'origin/dev'

疯狂的狮子li

2021-07-28 eb2be90e74adfa06ee251f80c08243d0301ce467

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

@@ -21,6 +21,7 @@
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.PostConstruct;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

@@ -31,9 +32,6 @@
 */
@Service
public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService {

   @Autowired
   private SysDictTypeMapper dictTypeMapper;

   @Autowired
   private SysDictDataMapper dictDataMapper;
@@ -149,9 +147,9 @@
            .eq(SysDictData::getDictType, dictType.getDictType())) > 0) {
            throw new CustomException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
         }
         dictTypeMapper.deleteById(dictId);
         DictUtils.removeDictCache(dictType.getDictType());
      }
      baseMapper.deleteBatchIds(Arrays.asList(dictIds));
   }

   /**