From e76bfd4b6f245f9f8736a5eeeba1e80f4b587a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sat, 8 Sep 2018 22:11:36 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=8D=E8=B5=B7=E4=BD=9C?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/codegen/mapper/SysGeneratorMapper.java | 14 +++++--------- .../service/impl/SysGeneratorServiceImpl.java | 5 +++-- 2 files changed, 8 insertions(+), 11 deletions(-) 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); } /**