Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "同步数据库表时保留更多信息（是否列表、是否查询、显示类型）"

Browse Source 
This reverts commit 068443889241ec8d0b26b6d98b5a456f2c408e48.
This commit is contained in:
耿嘉祺 2022-04-16 15:22:48 +08:00
parent 0684438892
commit 9de03b15e9
1 changed files with 1 additions and 7 deletions

8
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

@ -304,15 +304,9 @@ public class GenTableServiceImpl implements IGenTableService
column.setColumnId(prevColumn.getColumnId()); column.setColumnId(prevColumn.getColumnId());
if (column.isList()) if (column.isList())
{ {
// 如果是列表，继续保留字典类型/查询方式/是否列表选项 // 如果是列表，继续保留查询方式/字典类型选项
column.setDictType(prevColumn.getDictType()); column.setDictType(prevColumn.getDictType());
column.setQueryType(prevColumn.getQueryType()); column.setQueryType(prevColumn.getQueryType());
column.setIsList(prevColumn.getIsList());
}
if (column.isQuery()) {
// 如果可查询，继续保留是否查询/显示类型选项
column.setIsQuery(prevColumn.getIsQuery());
column.setHtmlType(prevColumn.getHtmlType());
} }
if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk() if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()
&& (column.isInsert() || column.isEdit()) && (column.isInsert() || column.isEdit())