BJ_ZTEITS-Developers / parking-cloud-yudao

Commit bf0e7d2c7747b6e14a122df37f6bae559f95039b

Authored by owen
1 parent 052328c5

System：字典数据列表过滤已关闭的数据

Inline Side-by-side
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
  View file @bf0e7d2
@@ -49,7 +49,7 @@ public class DictDataServiceImpl implements DictDataService { @@ -49,7 +49,7 @@ public class DictDataServiceImpl implements DictDataService {
49 49
50 @Override 50 @Override
51 public List<DictDataDO> getDictDataList() { 51 public List<DictDataDO> getDictDataList() {
52 - List<DictDataDO> list = dictDataMapper.selectList(); 52 + List<DictDataDO> list = dictDataMapper.selectList(DictDataDO::getStatus, CommonStatusEnum.ENABLE.getStatus());
53 list.sort(COMPARATOR_TYPE_AND_SORT); 53 list.sort(COMPARATOR_TYPE_AND_SORT);
54 return list; 54 return list;
55 } 55 }
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java
  View file @bf0e7d2
@@ -43,10 +43,15 @@ public class DictDataServiceImplTest extends BaseDbUnitTest { @@ -43,10 +43,15 @@ public class DictDataServiceImplTest extends BaseDbUnitTest {
43 @Test 43 @Test
44 public void testGetDictDataList() { 44 public void testGetDictDataList() {
45 // mock 数据 45 // mock 数据
46 - DictDataDO dictDataDO01 = randomDictDataDO().setDictType("yunai").setSort(2); 46 + DictDataDO dictDataDO01 = randomDictDataDO().setDictType("yunai").setSort(2)
  47 + .setStatus(CommonStatusEnum.ENABLE.getStatus());
47 dictDataMapper.insert(dictDataDO01); 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 dictDataMapper.insert(dictDataDO02); 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 // 调用