diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java index 7c5097764..d80395cc8 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java @@ -74,7 +74,7 @@ public interface DictService { * @param dictType 字典类型 * @return 字典类型详细信息 */ - DictTypeDTO getDictTypeDto(String dictType); + DictTypeDTO getDictType(String dictType); /** * 根据字典类型查询字典数据列表 @@ -82,6 +82,6 @@ public interface DictService { * @param dictType 字典类型 * @return 字典数据列表 */ - List getDictDataDto(String dictType); + List getDictData(String dictType); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java index 9d80d50e4..1e5188c38 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java @@ -275,7 +275,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @return 字典类型详细信息 */ @Override - public DictTypeDTO getDictTypeDto(String dictType) { + public DictTypeDTO getDictType(String dictType) { SysDictTypeVo vo = SpringUtils.getAopProxy(this).selectDictTypeByType(dictType); return BeanUtil.toBean(vo, DictTypeDTO.class); } @@ -287,7 +287,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @return 字典数据列表 */ @Override - public List getDictDataDto(String dictType) { + public List getDictData(String dictType) { List list = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); return BeanUtil.copyToList(list, DictDataDTO.class); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java index 0b4d4b790..4d8368a85 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java @@ -147,7 +147,7 @@ public class FlwNodeExtServiceImpl implements NodeExtService { * @return 返回构建好的 ChildNode 对象 */ private NodeExt.ChildNode buildChildNodeFromDict(String dictType) { - DictTypeDTO dictTypeDTO = dictService.getDictTypeDto(dictType); + DictTypeDTO dictTypeDTO = dictService.getDictType(dictType); if (ObjectUtil.isNull(dictTypeDTO)) { return null; } @@ -159,7 +159,7 @@ public class FlwNodeExtServiceImpl implements NodeExtService { // 描述 childNode.setDesc(dictTypeDTO.getRemark()); // 字典,下拉框和复选框时用到 - childNode.setDict(dictService.getDictDataDto(dictType) + childNode.setDict(dictService.getDictData(dictType) .stream().map(x -> new NodeExt.DictItem(x.getDictLabel(), x.getDictValue(), Convert.toBool(x.getIsDefault(), false)) ).toList());