mirror of
https://github.com/dromara/RuoYi-Vue-Plus.git
synced 2025-11-16 14:13:45 +08:00
Compare commits
2 Commits
34bac1add9
...
460545a75e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
460545a75e | ||
|
|
a93b30ec91 |
2
pom.xml
2
pom.xml
@@ -50,7 +50,7 @@
|
||||
<!-- 面向运行时的D-ORM依赖 -->
|
||||
<anyline.version>8.7.2-20250101</anyline.version>
|
||||
<!--工作流配置-->
|
||||
<warm-flow.version>1.6.7-M2</warm-flow.version>
|
||||
<warm-flow.version>1.6.7</warm-flow.version>
|
||||
|
||||
<!-- 插件版本 -->
|
||||
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
|
||||
|
||||
@@ -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<DictDataDTO> getDictDataDto(String dictType);
|
||||
List<DictDataDTO> getDictData(String dictType);
|
||||
|
||||
}
|
||||
|
||||
@@ -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<DictDataDTO> getDictDataDto(String dictType) {
|
||||
public List<DictDataDTO> getDictData(String dictType) {
|
||||
List<SysDictDataVo> list = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
|
||||
return BeanUtil.copyToList(list, DictDataDTO.class);
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user