Commit bf0e7d2c7747b6e14a122df37f6bae559f95039b
1 parent
052328c5
System:字典数据列表过滤已关闭的数据
Showing
2 changed files
with
8 additions
and
3 deletions
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
| ... | ... | @@ -49,7 +49,7 @@ public class DictDataServiceImpl implements DictDataService { |
| 49 | 49 | |
| 50 | 50 | @Override |
| 51 | 51 | public List<DictDataDO> getDictDataList() { |
| 52 | - List<DictDataDO> list = dictDataMapper.selectList(); | |
| 52 | + List<DictDataDO> list = dictDataMapper.selectList(DictDataDO::getStatus, CommonStatusEnum.ENABLE.getStatus()); | |
| 53 | 53 | list.sort(COMPARATOR_TYPE_AND_SORT); |
| 54 | 54 | return list; |
| 55 | 55 | } | ... | ... |
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java
| ... | ... | @@ -43,10 +43,15 @@ public class DictDataServiceImplTest extends BaseDbUnitTest { |
| 43 | 43 | @Test |
| 44 | 44 | public void testGetDictDataList() { |
| 45 | 45 | // mock 数据 |
| 46 | - DictDataDO dictDataDO01 = randomDictDataDO().setDictType("yunai").setSort(2); | |
| 46 | + DictDataDO dictDataDO01 = randomDictDataDO().setDictType("yunai").setSort(2) | |
| 47 | + .setStatus(CommonStatusEnum.ENABLE.getStatus()); | |
| 47 | 48 | dictDataMapper.insert(dictDataDO01); |
| 48 | - DictDataDO dictDataDO02 = randomDictDataDO().setDictType("yunai").setSort(1); | |
| 49 | + DictDataDO dictDataDO02 = randomDictDataDO().setDictType("yunai").setSort(1) | |
| 50 | + .setStatus(CommonStatusEnum.ENABLE.getStatus()); | |
| 49 | 51 | dictDataMapper.insert(dictDataDO02); |
| 52 | + DictDataDO dictDataDO03 = randomDictDataDO().setDictType("yunai").setSort(3) | |
| 53 | + .setStatus(CommonStatusEnum.DISABLE.getStatus()); | |
| 54 | + dictDataMapper.insert(dictDataDO03); | |
| 50 | 55 | // 准备参数 |
| 51 | 56 | |
| 52 | 57 | // 调用 | ... | ... |