Merge remote-tracking branch 'origin/master'

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<SysTemplate> list = templateService.list(new QueryWrapper<SysTemplate>().eq("type", 1));
+        List<SysTemplate> list = templateService.list(new QueryWrapper<SysTemplate>().eq("type", 1).eq("is_hide",0));
         return R.success(list);
     }
 

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;
 }

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;
+
 }

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}
 
 
         <if test="req.labelName != null and req.labelName.size() > 0 ">

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
     </select>
 </mapper>