From 068443889241ec8d0b26b6d98b5a456f2c408e48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=BF=E5=98=89=E7=A5=BA?= <gengjiaqi9698@qq.com>
Date: Sat, 16 Apr 2022 15:18:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E8=A1=A8=E6=97=B6=E4=BF=9D=E7=95=99=E6=9B=B4=E5=A4=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=88=E6=98=AF=E5=90=A6=E5=88=97=E8=A1=A8=E3=80=81?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9F=A5=E8=AF=A2=E3=80=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/generator/service/GenTableServiceImpl.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 71f2f8a5e..7609a1221 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
@@ -304,9 +304,15 @@ public class GenTableServiceImpl implements IGenTableService
                 column.setColumnId(prevColumn.getColumnId());
                 if (column.isList())
                 {
-                    // 如果是列表，继续保留查询方式/字典类型选项
+                    // 如果是列表，继续保留字典类型/查询方式/是否列表选项
                     column.setDictType(prevColumn.getDictType());
                     column.setQueryType(prevColumn.getQueryType());
+                    column.setIsList(prevColumn.getIsList());
+                }
+                if (column.isQuery()) {
+                    // 如果可查询，继续保留是否查询/显示类型选项
+                    column.setIsQuery(prevColumn.getIsQuery());
+                    column.setHtmlType(prevColumn.getHtmlType());
                 }
                 if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()
                         && (column.isInsert() || column.isEdit())