|
@@ -358,8 +358,11 @@ public class TableServiceCmdService {
|
|
|
if (isNotEmpty(dictType) && jsonObject.containsKey(column.getColumnName())) {
|
|
|
String dictLabel = null;
|
|
|
try {
|
|
|
+ List<SysDictData> sysDictData = listSysDictDataByType(dictType);
|
|
|
+ jsonObject.put("sysDictData", sysDictData);
|
|
|
dictLabel = remoteDictDataService.selectDictLabel(dictType, jsonObject.getString(column.getColumnName()));
|
|
|
jsonObject.put(column.getColumnName(), dictLabel);
|
|
|
+ column.setColumnValue(jsonObject.get(column.getColumnName()));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -411,6 +414,7 @@ public class TableServiceCmdService {
|
|
|
}
|
|
|
|
|
|
column.setColumnValue(json.get(column.getColumnName()));
|
|
|
+ column.setSysDictData((List<SysDictData>)json.get("sysDictData"));
|
|
|
}
|
|
|
|
|
|
children.add(column);
|