diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictTypeServiceImpl.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictTypeServiceImpl.java index 48d163489..e55ece3a5 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictTypeServiceImpl.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictTypeServiceImpl.java @@ -28,8 +28,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; -import static cn.stylefeng.roses.kernel.dict.api.constants.DictConstants.CONFIG_GROUP_DICT_TYPE_CODE; - /** * 字典类型表 服务实现类 * @@ -178,10 +176,18 @@ public class DictTypeServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysDictType::getDictTypeCode, CONFIG_GROUP_DICT_TYPE_CODE); - return this.getOne(queryWrapper); + public SysDictType detailBy(DictTypeRequest dictTypeRequest) { + List list = this.listBy(dictTypeRequest); + if (list.isEmpty()) { + return null; + } + return list.get(0); + } + + @Override + public List listBy(DictTypeRequest dictTypeRequest) { + LambdaQueryWrapper queryWrapper = this.createWrapper(dictTypeRequest); + return this.list(queryWrapper); } /** @@ -198,4 +204,37 @@ public class DictTypeServiceImpl extends ServiceImpl createWrapper(DictTypeRequest translationRequest) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + String dictTypeCode = translationRequest.getDictTypeCode(); + String dictTypeName = translationRequest.getDictTypeName(); + queryWrapper.eq(ObjectUtil.isNotNull(dictTypeCode), SysDictType::getDictTypeCode, dictTypeCode); + queryWrapper.like(ObjectUtil.isNotNull(dictTypeName), SysDictType::getDictTypeName, dictTypeName); + queryWrapper.eq(SysDictType::getDelFlag, YesOrNotEnum.N.getCode()); + + return queryWrapper; + } + }