From 318107dbd70f5f9d2ca404a203b1f0b961997a51 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 12 Aug 2022 11:59:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=95=B0=E6=8D=AE=E8=A1=A8?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/service/impl/GenerateServiceImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index 887d3e88..c4ca61bd 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -286,19 +286,22 @@ public class GenerateServiceImpl implements IGenerateService { @Override @Transactional public void syncTable(Integer id) { - // 原表数据 + // 生成的数据 GenTable genTable = genTableMapper.selectById(id); + Assert.notNull(genTable, "生成数据不存在！"); + + // 旧表的数据 List genTableColumns = genTableColumnMapper.selectList( new QueryWrapper() .eq("table_id", id) .orderByAsc("sort")); - - Assert.isFalse(StringUtil.isEmpty(genTableColumns), "原表数据异常！"); + Assert.isFalse(StringUtil.isEmpty(genTableColumns), "旧数据异常！"); // 原表转Map Map tableColumnMap = genTableColumns .stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity())); + // 新表数据 List columns = genTableMapper.selectDbTableColumnsByName(genTable.getTableName()); if (StringUtil.isNull(columns)) { @@ -318,8 +321,8 @@ public class GenerateServiceImpl implements IGenerateService { } if (prevColumn.getIsRequired() == 1 - && column.getIsPk() == 0 - && (column.getIsInsert() == 1 || column.getIsEdit() == 1)) { + && prevColumn.getIsPk() == 0 + && (prevColumn.getIsInsert() == 1 || prevColumn.getIsEdit() == 1)) { column.setHtmlType(prevColumn.getHtmlType()); column.setIsRequired(prevColumn.getIsRequired()); }