update 补全事务注解异常

疯狂的狮子Li

2022-02-17 14c412113f661c4ebb1132424900dd4258dd108c

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

@@ -121,7 +121,7 @@
     * @return 结果

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void updateGenTable(GenTable genTable)

    {

        String options = JSON.toJSONString(genTable.getParams());

@@ -143,7 +143,7 @@
     * @return 结果

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void deleteGenTableByIds(Long[] tableIds)

    {

        genTableMapper.deleteGenTableByIds(tableIds);

@@ -156,7 +156,7 @@
     * @param tableList 导入表列表

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void importGenTable(List<GenTable> tableList)

    {

        String operName = SecurityUtils.getUsername();

@@ -282,7 +282,7 @@
     * @param tableName 表名称

     */

    @Override

    @Transactional

    @Transactional(rollbackFor = Exception.class)

    public void synchDb(String tableName)

    {

        GenTable table = genTableMapper.selectGenTableByName(tableName);

@@ -304,8 +304,17 @@
                column.setColumnId(prevColumn.getColumnId());

                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);

            }