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

This commit is contained in:
疯狂的狮子li 2021-07-27 11:07:40 +08:00
commit 51ae60820d
1 changed files with 1 additions and 2 deletions

View File

@ -11,7 +11,6 @@ import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictDataService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
@ -84,10 +83,10 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
public void deleteDictDataByIds(Long[] dictCodes) { public void deleteDictDataByIds(Long[] dictCodes) {
for (Long dictCode : dictCodes) { for (Long dictCode : dictCodes) {
SysDictData data = selectDictDataById(dictCode); SysDictData data = selectDictDataById(dictCode);
removeById(dictCode);
List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType()); List<SysDictData> dictDatas = baseMapper.selectDictDataByType(data.getDictType());
DictUtils.setDictCache(data.getDictType(), dictDatas); DictUtils.setDictCache(data.getDictType(), dictDatas);
} }
baseMapper.deleteBatchIds(Arrays.asList(dictCodes));
} }
/** /**