|
@@ -474,8 +474,7 @@ public class TableServiceCmdService {
|
|
String dictType = column.getDictType();
|
|
String dictType = column.getDictType();
|
|
if (ObjectUtils.isNotEmpty(dictType)) {
|
|
if (ObjectUtils.isNotEmpty(dictType)) {
|
|
try {
|
|
try {
|
|
- List<SysDictData> sysDictData1 = remoteDictDataService.listByType(dictType);
|
|
|
|
- column.setSysDictData(sysDictData1);
|
|
|
|
|
|
+ column.setSysDictData(listSysDictDataByType(dictType));
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
System.out.println("sq_dictType = " + dictType);
|
|
System.out.println("sq_dictType = " + dictType);
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
@@ -515,8 +514,7 @@ public class TableServiceCmdService {
|
|
if (GenTableColumn.IS_QUERY.equalsIgnoreCase(column.getIsQuery())) {
|
|
if (GenTableColumn.IS_QUERY.equalsIgnoreCase(column.getIsQuery())) {
|
|
String dictType = column.getDictType();
|
|
String dictType = column.getDictType();
|
|
if (ObjectUtils.isNotEmpty(dictType)) {
|
|
if (ObjectUtils.isNotEmpty(dictType)) {
|
|
- List<SysDictData> sysDictData1 = remoteDictDataService.listByType(dictType);
|
|
|
|
- column.setSysDictData(sysDictData1);
|
|
|
|
|
|
+ column.setSysDictData(listSysDictDataByType(dictType));
|
|
}
|
|
}
|
|
queryList.add(column);
|
|
queryList.add(column);
|
|
}
|
|
}
|
|
@@ -802,8 +800,7 @@ public class TableServiceCmdService {
|
|
for (GenTableColumn column : columns) {
|
|
for (GenTableColumn column : columns) {
|
|
String dictType = column.getDictType();
|
|
String dictType = column.getDictType();
|
|
if (predicate.test(dictType)) {
|
|
if (predicate.test(dictType)) {
|
|
- List<SysDictData> sysDictData1 = remoteDictDataService.listByType(dictType);
|
|
|
|
- column.setSysDictData(sysDictData1);
|
|
|
|
|
|
+ column.setSysDictData(listSysDictDataByType(dictType));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -812,5 +809,15 @@ public class TableServiceCmdService {
|
|
public AjaxResult listAllColumnsByTableId(GenTable table) {
|
|
public AjaxResult listAllColumnsByTableId(GenTable table) {
|
|
return remoteGenTableColumnService.listColumnsByTableId(table.getTableId());
|
|
return remoteGenTableColumnService.listColumnsByTableId(table.getTableId());
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ public List<SysDictData> listSysDictDataByType(String dictType){
|
|
|
|
+ List<SysDictData> sysDictData = null;
|
|
|
|
+ try {
|
|
|
|
+ sysDictData = remoteDictDataService.listByType(dictType);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ return sysDictData;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|