From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001 From: KonBAI <1527468660@qq.com> Date: 星期六, 02 四月 2022 13:02:56 +0800 Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本,处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。 --- ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java index 9c2a5f2..c432d06 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java @@ -1,9 +1,9 @@ package com.ruoyi.generator.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.generator.domain.GenTable; +import com.ruoyi.generator.domain.GenTableColumn; import java.util.List; import java.util.Map; @@ -15,11 +15,13 @@ */ public interface IGenTableService { - - TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable, PageQuery pageQuery); - - - TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable, PageQuery pageQuery); + /** + * 鏌ヨ涓氬姟瀛楁鍒楄〃 + * + * @param tableId 涓氬姟瀛楁缂栧彿 + * @return 涓氬姟瀛楁闆嗗悎 + */ + List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId); /** * 鏌ヨ涓氬姟鍒楄〃 @@ -27,7 +29,7 @@ * @param genTable 涓氬姟淇℃伅 * @return 涓氬姟闆嗗悎 */ - List<GenTable> selectGenTableList(GenTable genTable); + TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable, PageQuery pageQuery); /** * 鏌ヨ鎹簱鍒楄〃 @@ -35,7 +37,7 @@ * @param genTable 涓氬姟淇℃伅 * @return 鏁版嵁搴撹〃闆嗗悎 */ - List<GenTable> selectDbTableList(GenTable genTable); + TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable, PageQuery pageQuery); /** * 鏌ヨ鎹簱鍒楄〃 -- Gitblit v1.9.3