From b03d89e792a34c486f0afeab69e837f85d8cbe16 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 25 三月 2025 15:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java
index cda9e1c..81858aa 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java
@@ -130,19 +130,24 @@
@Override
public PageDTO<SysDictDataVO> pageList(KeyWordQuery query) {
- Page<SysDictData> result = this.lambdaQuery().like(StringUtils.isNotBlank(query.getKeyword()), SysDictData::getDictLabel, query.getKeyword()).page(new Page<>(query.getPageCurr(), query.getPageSize()));
+ Page<SysDictData> result = this.lambdaQuery()
+ .like(StringUtils.isNotBlank(query.getKeyword()), SysDictData::getDictLabel, query.getKeyword())
+ .eq(StringUtils.isNotBlank(query.getDictType()), SysDictData::getDictType, query.getDictType())
+ .page(new Page<>(query.getPageCurr(), query.getPageSize()));
List<String> dictTypeList = result.getRecords().stream().map(SysDictData::getDictType).distinct().collect(Collectors.toList());
if (CollUtils.isNotEmpty(dictTypeList)) {
+ PageDTO<SysDictDataVO> sysDictDataVOPageDTO = PageDTO.of(result, SysDictDataVO.class);
List<SysDictType> sysDictTypes = dictTypeMapper.selectList(new LambdaQueryWrapper<SysDictType>().in(SysDictType::getDictType, dictTypeList));
- result.getRecords().forEach(sysDictData -> {
+ sysDictDataVOPageDTO.getList().forEach(vo -> {
sysDictTypes.forEach(sysDictType -> {
- if (sysDictType.getDictType().equals(sysDictData.getDictType())) {
- sysDictData.setDictType(sysDictType.getDictName());
+ if (sysDictType.getDictType().equals(vo.getDictType())) {
+ vo.setDictTypeName(sysDictType.getDictName());
}
});
});
+ return sysDictDataVOPageDTO;
}
- return PageDTO.of(result, SysDictDataVO.class);
+ return PageDTO.empty(result);
}
@Override
--
Gitblit v1.7.1