|
@@ -46,11 +46,18 @@ public class DictionarydetailController {
|
|
|
|
|
|
@GetMapping
|
|
|
@ApiOperation(value = "获取当前数据字典详情(不分页)")
|
|
|
- public R list(DictionaryDetailListDto dto){
|
|
|
+ public R list(DictionaryDetailListDto dto) {
|
|
|
LambdaQueryWrapper<DictionaryDetail> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.eq(StrUtil.isNotEmpty(dto.getName()),DictionaryDetail::getName,dto.getName());
|
|
|
- queryWrapper.eq(StrUtil.isNotEmpty(dto.getCode()),DictionaryDetail::getCode,dto.getCode());
|
|
|
- queryWrapper.eq(ObjectUtil.isNotEmpty(dto.getItemId()) && dto.getItemId() != 0,DictionaryDetail::getItemId,dto.getItemId());
|
|
|
+ queryWrapper.eq(StrUtil.isNotEmpty(dto.getName()), DictionaryDetail::getName, dto.getName());
|
|
|
+ queryWrapper.eq(StrUtil.isNotEmpty(dto.getCode()), DictionaryDetail::getCode, dto.getCode());
|
|
|
+ if (StrUtil.isNotEmpty(dto.getPCode())) {
|
|
|
+ DictionaryDetail dictionaryDetail = dictionarydetailService.getOne(Wrappers.lambdaQuery(DictionaryDetail.class).eq(DictionaryDetail::getCode, dto.getPCode()));
|
|
|
+ if (dictionaryDetail != null) {
|
|
|
+ queryWrapper.eq(DictionaryDetail::getPId, dictionaryDetail.getId());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ queryWrapper.eq(ObjectUtil.isNotEmpty(dto.getItemId()) && dto.getItemId() != 0, DictionaryDetail::getItemId, dto.getItemId());
|
|
|
queryWrapper.select(DictionaryDetail.class, x -> VoToColumnUtil.fieldsToColumns(DictionaryDetailListVo.class).contains(x.getProperty()));
|
|
|
queryWrapper.orderByAsc(DictionaryDetail::getSortCode);
|
|
|
List<DictionaryDetail> list = dictionarydetailService.list(queryWrapper);
|