|
@@ -682,12 +682,12 @@ public class TableServiceCmdService {
|
|
|
public AjaxResult getByTableName(GenTable genTable, Boolean isUi) {
|
|
|
String tableName = genTable.getTableName();
|
|
|
List<GenTableColumn> allColumns = genTable.getColumns();
|
|
|
+ List<GenTableColumn> parentColumns = filterHrAndSort(allColumns);
|
|
|
List<GenTableColumn> resultCols;
|
|
|
// 所有新增可见的列
|
|
|
allColumns = filterData(allColumns, 0, MaskConstant.INSERT_VISIBLE::equals);
|
|
|
// 带折叠
|
|
|
if (BooleanUtils.isTrue(isUi)) {
|
|
|
- List<GenTableColumn> parentColumns = filterHrAndSort(allColumns);
|
|
|
// 把孩子放入父亲的怀抱
|
|
|
for (GenTableColumn hrColumn : parentColumns) {
|
|
|
List<GenTableColumn> children = Lists.newArrayListWithCapacity(16);
|