|
@@ -55,7 +55,8 @@ public class HandlerFormDataUtils {
|
|
|
String columnName = column.getColumnName();
|
|
|
if (string.equals(columnName) && isNotEmpty(dictType)) {
|
|
|
// 列表需要字典值的dictLabel, 不放入sysDictData
|
|
|
- List<SysDictData> sysDictData = column.getSysDictData();
|
|
|
+ List<SysDictData> sysDictData = new ArrayList<>();
|
|
|
+ genDictData(column.getSysDictData(), sysDictData);
|
|
|
//获取到字段的值
|
|
|
String value = String.valueOf(jsonObject.get(string));
|
|
|
if (sysDictData != null && sysDictData.size() > 0){
|
|
@@ -72,6 +73,24 @@ public class HandlerFormDataUtils {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 获取所有的字典数据
|
|
|
+ * @param sysDictData
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ private static List<SysDictData> genDictData(List<SysDictData> datas, List<SysDictData> sysDictData) {
|
|
|
+ if(isEmpty(datas)) {
|
|
|
+ return sysDictData;
|
|
|
+ }
|
|
|
+ for(SysDictData dictData : datas) {
|
|
|
+ sysDictData.add(dictData);
|
|
|
+ if(isNotEmpty(dictData.getChildren())) {
|
|
|
+ genDictData(dictData.getChildren(), sysDictData);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return sysDictData;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 功能描述: 把timeStamp转为string, 默认类型为:YYYY_MM_DD
|
|
|
*
|