ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !298 from Mart/master

This commit is contained in:
Mart 2021-06-04 15:42:03 +08:00 committed by Gitee
parent 4b59c590e0 8d9d9caf77
commit 101dc0d023
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
View File

@ -130,24 +130,7 @@ public class GenController extends BaseController
public String edit(@PathVariable("tableId") Long tableId, ModelMap mmap) public String edit(@PathVariable("tableId") Long tableId, ModelMap mmap)
{ {
GenTable table = genTableService.selectGenTableById(tableId); GenTable table = genTableService.selectGenTableById(tableId);
List<GenTable> genTables = genTableService.selectGenTableAll();
List<CxSelect> cxSelect = new ArrayList<CxSelect>();
for (GenTable genTable : genTables)
{
if (!StringUtils.equals(table.getTableName(), genTable.getTableName()))
{
CxSelect cxTable = new CxSelect(genTable.getTableName(), genTable.getTableName() + '：' + genTable.getTableComment());
List<CxSelect> cxColumns = new ArrayList<CxSelect>();
for (GenTableColumn tableColumn : genTable.getColumns())
{
cxColumns.add(new CxSelect(tableColumn.getColumnName(), tableColumn.getColumnName() + '：' + tableColumn.getColumnComment()));
}
cxTable.setS(cxColumns);
cxSelect.add(cxTable);
}
}
mmap.put("table", table); mmap.put("table", table);
mmap.put("data", JSON.toJSON(cxSelect));
return prefix + "/edit"; return prefix + "/edit";
} }