!361 优化一些布尔判断语法 Merge pull request !361 from 清溪先生/master

若依

2021-11-01 2fe919b6ceeab958d1d5e65a8b39fca129f0e6c5

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

@@ -1,19 +1,19 @@
package com.ruoyi.system.service.impl;



import java.util.List;

import javax.annotation.PostConstruct;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import com.ruoyi.common.constant.UserConstants;

import com.ruoyi.common.core.domain.entity.SysDictData;

import com.ruoyi.common.core.domain.entity.SysDictType;

import com.ruoyi.common.exception.CustomException;

import com.ruoyi.common.exception.ServiceException;

import com.ruoyi.common.utils.DictUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.system.mapper.SysDictDataMapper;

import com.ruoyi.system.mapper.SysDictTypeMapper;

import com.ruoyi.system.service.ISysDictTypeService;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import javax.annotation.PostConstruct;

import java.util.List;



/**

 * 字典 业务层处理

@@ -122,7 +122,7 @@
            SysDictType dictType = selectDictTypeById(dictId);

            if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0)

            {

                throw new CustomException(String.format("%1$s已分配,不能删除", dictType.getDictName()));

                throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName()));

            }

            dictTypeMapper.deleteDictTypeById(dictId);

            DictUtils.removeDictCache(dictType.getDictType());

@@ -132,6 +132,7 @@
    /**

     * 加载字典缓存数据

     */

    @Override

    public void loadingDictCache()

    {

        List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll();

@@ -145,6 +146,7 @@
    /**

     * 清空字典缓存数据

     */

    @Override

    public void clearDictCache()

    {

        DictUtils.clearDictCache();

@@ -153,6 +155,7 @@
    /**

     * 重置字典缓存数据

     */

    @Override

    public void resetDictCache()

    {

        clearDictCache();