|
|
@@ -64,6 +64,13 @@ public class DictionarydetailController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (StrUtil.isNotEmpty(dto.getItemCode())) {
|
|
|
+ DictionaryItem dictionaryItem = dictionaryitemService.getOne(Wrappers.lambdaQuery(DictionaryItem.class).eq(DictionaryItem::getCode, dto.getItemCode()));
|
|
|
+ if (dictionaryItem != null) {
|
|
|
+ queryWrapper.eq(DictionaryDetail::getItemId, dictionaryItem.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);
|