From 2dcb6c6591285c8616f3367a4e3a1accaf4acba6 Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Thu, 15 Dec 2022 14:03:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/huoran/iasf/controller/SysTemplateController.java | 2 +- src/main/java/com/huoran/iasf/entity/SysTemplate.java | 3 ++- src/main/java/com/huoran/iasf/entity/SysTemplateStyle.java | 3 +++ .../iasf/mapper/xml/SysTemplateStyleConfigurationMapper.xml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/huoran/iasf/controller/SysTemplateController.java b/src/main/java/com/huoran/iasf/controller/SysTemplateController.java index c164ef4..2c22620 100644 --- a/src/main/java/com/huoran/iasf/controller/SysTemplateController.java +++ b/src/main/java/com/huoran/iasf/controller/SysTemplateController.java @@ -49,7 +49,7 @@ public class SysTemplateController { @PostMapping("/listOfColumnTemplates") @ApiOperation(value = "获取文章模板列表、详情样式", response = SysTemplate.class) public R listOfColumnTemplates() { - List list = templateService.list(new QueryWrapper().eq("type", 1)); + List list = templateService.list(new QueryWrapper().eq("type", 1).eq("is_hide",0)); return R.success(list); } diff --git a/src/main/java/com/huoran/iasf/entity/SysTemplate.java b/src/main/java/com/huoran/iasf/entity/SysTemplate.java index f8f6309..8b1d0ea 100644 --- a/src/main/java/com/huoran/iasf/entity/SysTemplate.java +++ b/src/main/java/com/huoran/iasf/entity/SysTemplate.java @@ -36,5 +36,6 @@ public class SysTemplate implements Serializable { @ApiModelProperty(value = "类型(0栏目 1文章)") private Integer type; - + @ApiModelProperty(value = "是否隐藏(0默认不隐藏 1隐藏)") + private Integer isHide; } diff --git a/src/main/java/com/huoran/iasf/entity/SysTemplateStyle.java b/src/main/java/com/huoran/iasf/entity/SysTemplateStyle.java index 41552df..cbaeb9d 100644 --- a/src/main/java/com/huoran/iasf/entity/SysTemplateStyle.java +++ b/src/main/java/com/huoran/iasf/entity/SysTemplateStyle.java @@ -43,4 +43,7 @@ public class SysTemplateStyle implements Serializable { @ApiModelProperty(value = "是否为长页") private Integer isLongPage; + @ApiModelProperty(value = "是否隐藏(0默认不隐藏 1隐藏)") + private Integer isHide; + } diff --git a/src/main/java/com/huoran/iasf/mapper/xml/SysTemplateStyleConfigurationMapper.xml b/src/main/java/com/huoran/iasf/mapper/xml/SysTemplateStyleConfigurationMapper.xml index d1e46f7..b36c0e9 100644 --- a/src/main/java/com/huoran/iasf/mapper/xml/SysTemplateStyleConfigurationMapper.xml +++ b/src/main/java/com/huoran/iasf/mapper/xml/SysTemplateStyleConfigurationMapper.xml @@ -8,6 +8,6 @@ inner join sys_template t on c.template_id = t.id inner join sys_template_style s on s.id = c.style_id WHERE c.template_id = #{templateId} - and s.type = #{type} + and s.type = #{type} and s.is_hide = 0 From 4a1e0b54b0fafd2713bc9e1ffbe30096edfb00c6 Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Wed, 21 Dec 2022 18:20:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/huoran/iasf/mapper/xml/SysContentMapper.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml b/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml index 448149b..2ae29d4 100644 --- a/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml +++ b/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml @@ -51,7 +51,8 @@ ( SELECT GROUP_CONCAT( label_name ) FROM sys_content_label l WHERE deleted = 1 AND FIND_IN_SET( l.id, s.lable_id ) ) AS labelName, ( SELECT c.classification_name FROM sys_content_classification c WHERE deleted = 1 AND s.classification_id = - c.id ) AS classificationName + c.id ) AS classificationName , + (SELECT c.column_name from sys_column c WHERE c.id = s.column_id) as columnName FROM sys_content s WHERE @@ -59,7 +60,7 @@ AND is_release = 1 ) t WHERE - t.site_id = 1 + t.site_id = #{req.siteId}