diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/SysGeneratorMapper.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/SysGeneratorMapper.java index dce9db073..e774a7339 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/SysGeneratorMapper.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/SysGeneratorMapper.java @@ -18,6 +18,7 @@ package com.pig4cloud.pigx.codegen.mapper; import com.pig4cloud.pigx.common.core.util.Query; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -34,20 +35,14 @@ public interface SysGeneratorMapper { * 分页查询表格 * * @param params + * @param tableName * @return */ - List> queryList(Query params); - - /** - * 查询表数量 - * - * @param query - * @return - */ - int queryTotal(Map query); + List> queryList(Query params, @Param("tableName") Object tableName); /** * 查询表信息 + * * @param tableName 表名称 * @return */ @@ -55,6 +50,7 @@ public interface SysGeneratorMapper { /** * 查询表列信息 + * * @param tableName 表名称 * @return */ diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java index 731f756e7..204f7a9e8 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java @@ -50,8 +50,9 @@ public class SysGeneratorServiceImpl implements SysGeneratorService { * @return */ @Override - public List> queryPage(Query query) { - return sysGeneratorMapper.queryList(query); + public List> queryPage(Query query) { + Object tableName = query.getCondition().get("tableName"); + return sysGeneratorMapper.queryList(query, tableName); } /**