|
@@ -402,7 +402,7 @@ public class TableServiceCmdService {
|
|
* @return java.util.List<com.boman.domain.GenTableColumn>
|
|
* @return java.util.List<com.boman.domain.GenTableColumn>
|
|
*/
|
|
*/
|
|
private List<GenTableColumn> getQueryColumns(List<GenTableColumn> allColumns) {
|
|
private List<GenTableColumn> getQueryColumns(List<GenTableColumn> allColumns) {
|
|
- ArrayList<GenTableColumn> queryList = Lists.newArrayListWithCapacity(16);
|
|
|
|
|
|
+ List<GenTableColumn> queryList = Lists.newArrayListWithCapacity(16);
|
|
for (GenTableColumn column : allColumns) {
|
|
for (GenTableColumn column : allColumns) {
|
|
if (GenTableColumn.IS_QUERY.equalsIgnoreCase(column.getIsQuery())) {
|
|
if (GenTableColumn.IS_QUERY.equalsIgnoreCase(column.getIsQuery())) {
|
|
String dictType = column.getDictType();
|
|
String dictType = column.getDictType();
|
|
@@ -429,7 +429,7 @@ public class TableServiceCmdService {
|
|
}
|
|
}
|
|
|
|
|
|
List<String> permses = map(menus, SysMenu::getPerms);
|
|
List<String> permses = map(menus, SysMenu::getPerms);
|
|
- ArrayList<String> btns = Lists.newArrayListWithCapacity(permses.size());
|
|
|
|
|
|
+ List<String> btns = Lists.newArrayListWithCapacity(permses.size());
|
|
for (String perms : permses) {
|
|
for (String perms : permses) {
|
|
if (perms.contains(tableName)) {
|
|
if (perms.contains(tableName)) {
|
|
btns.add(RoleMenuDto.getBtnFromPerms(perms));
|
|
btns.add(RoleMenuDto.getBtnFromPerms(perms));
|
|
@@ -704,7 +704,7 @@ public class TableServiceCmdService {
|
|
JSONObject jsonObject = new JSONObject();
|
|
JSONObject jsonObject = new JSONObject();
|
|
String msg = "请输入正确的";
|
|
String msg = "请输入正确的";
|
|
for (GenTableColumn column : allColumns) {
|
|
for (GenTableColumn column : allColumns) {
|
|
- ArrayList<JSONObject> list = Lists.newArrayList();
|
|
|
|
|
|
+ List<JSONObject> list = Lists.newArrayList();
|
|
if (GenTableColumn.IS_REQUIRED.equals(column.getIsRequired())) {
|
|
if (GenTableColumn.IS_REQUIRED.equals(column.getIsRequired())) {
|
|
JSONObject inner1 = new JSONObject();
|
|
JSONObject inner1 = new JSONObject();
|
|
inner1.put(TRIGGER, BLUR);
|
|
inner1.put(TRIGGER, BLUR);
|