代码生成同步保留必填/类型选项

RuoYi

2022-02-13 0e132967525a270489b494d10cd6772de78e5c74

 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java

@@ -287,7 +287,7 @@
    {

        GenTable table = genTableMapper.selectGenTableByName(tableName);

        List<GenTableColumn> tableColumns = table.getColumns();

        Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName,  Function.identity()));

        Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity()));



        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);

        if (StringUtils.isEmpty(dbTableColumns))

@@ -302,12 +302,24 @@
            {

                GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());

                column.setColumnId(prevColumn.getColumnId());

                if (column.isList()) {

                    // 如果是列表，继续保留字典类型

                if (column.isList())

                {

                    // 如果是列表，继续保留查询方式/字典类型选项

                    column.setDictType(prevColumn.getDictType());

                    column.setQueryType(prevColumn.getQueryType());

                }

                if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()

                        && (column.isInsert() || column.isEdit())

                        && ((column.isUsableColumn()) || (!column.isSuperColumn())))

                {

                    // 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项

                    column.setIsRequired(prevColumn.getIsRequired());

                    column.setHtmlType(prevColumn.getHtmlType());

                }

                genTableColumnMapper.updateGenTableColumn(column);

            } else {

            }

            else

            {

                genTableColumnMapper.insertGenTableColumn(column);

            }

        });

@@ -368,7 +380,7 @@
                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));

                IOUtils.write(sw.toString(), zip, Constants.UTF8);

                IOUtils.closeQuietly(sw);

            zip.flush();

                zip.flush();

                zip.closeEntry();

            }

            catch (IOException e)

@@ -451,6 +463,7 @@
            }

        }

    }



    /**

     * 设置主子表信息

     * 

@@ -480,7 +493,7 @@
            String treeName = paramsObj.getString(GenConstants.TREE_NAME);

            String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);

            String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);

            


            genTable.setTreeCode(treeCode);

            genTable.setTreeParentCode(treeParentCode);

            genTable.setTreeName(treeName);