Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-07-27 51ae60820da95805287e9a4448f7cc35888a8957

Merge remote-tracking branch 'origin/dev' into dev

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

@@ -11,7 +11,6 @@
import com.ruoyi.system.service.ISysDictDataService;
import org.springframework.stereotype.Service;

import java.util.Arrays;
import java.util.List;

/**
@@ -84,10 +83,10 @@
    public void deleteDictDataByIds(Long[] dictCodes) {
        for (Long dictCode : dictCodes) {
            SysDictData data = selectDictDataById(dictCode);
            removeById(dictCode);
            List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType());
            DictUtils.setDictCache(data.getDictType(), dictDatas);
        }
        baseMapper.deleteBatchIds(Arrays.asList(dictCodes));
    }

    /**