From caa81d1f4dbb0f608b7a6848e673eca2c4a69d10 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 五月 2021 16:12:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
index 7fc96e2..f156e4f 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -10,7 +10,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.generator.domain.GenTable;
@@ -64,6 +66,16 @@
GenTable genTable = baseMapper.selectGenTableById(id);
setTableFromOptions(genTable);
return genTable;
+ }
+
+ @Override
+ public TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable) {
+ return PageUtils.buildDataInfo(baseMapper.selectPageGenTableList(PageUtils.buildPage(), genTable));
+ }
+
+ @Override
+ public TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable) {
+ return PageUtils.buildDataInfo(baseMapper.selectPageDbTableList(PageUtils.buildPage(), genTable));
}
/**
@@ -131,6 +143,7 @@
.set(cenTableColumn.getIsEdit() == null, GenTableColumn::getIsEdit, null)
.set(cenTableColumn.getIsList() == null, GenTableColumn::getIsList, null)
.set(cenTableColumn.getIsQuery() == null, GenTableColumn::getIsQuery, null)
+ .set(cenTableColumn.getIsRequired() == null, GenTableColumn::getIsRequired, null)
.eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
}
}
@@ -446,4 +459,4 @@
}
return genPath + File.separator + VelocityUtils.getFileName(template, table);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3