farmer-cms.git - Gitblit

			@@ -1,14 +1,17 @@
			package com.xcong.farmer.cms.core.handler;

			import cn.hutool.core.collection.CollUtil;
			import cn.hutool.core.util.ObjectUtil;
			import com.xcong.farmer.cms.configurations.properties.CmsProperties;
			import com.xcong.farmer.cms.conversion.ColumnConversion;
			import com.xcong.farmer.cms.core.node.AttrNode;
			import com.xcong.farmer.cms.core.tag.data.NavData;
			import com.xcong.farmer.cms.core.tag.model.Nav;
			import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
			import com.xcong.farmer.cms.modules.system.entity.CmsTemplateEntity;
			import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
			import com.xcong.farmer.cms.modules.system.mapper.ArticleMapper;
			import com.xcong.farmer.cms.modules.system.mapper.CmsTemplateMapper;
			import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
			import com.xcong.farmer.cms.modules.system.vo.AdminColumnVo;
			import com.xcong.farmer.cms.utils.SpringContextHolder;
			@@ -28,6 +31,7 @@

			private ColumnMapper columnMapper = SpringContextHolder.getBean(ColumnMapper.class);
			private ArticleMapper articleMapper = SpringContextHolder.getBean(ArticleMapper.class);
			private CmsTemplateMapper cmsTemplateMapper = SpringContextHolder.getBean(CmsTemplateMapper.class);

			private String baseUrl = "";
			@Override
			@@ -45,9 +49,13 @@
			List<NavData> list = new ArrayList<>();

			NavData index = new NavData();
			// index.setTitle("首页");

			index.setTitle("Main");
			//首页是否设置，设置了从内容模版表中取名称
			CmsTemplateEntity cmsTemplateEntity = cmsTemplateMapper.selectByPathAndCompanyId("index.html", companyId);
			if(ObjectUtil.isNotEmpty(cmsTemplateEntity)){
			index.setTitle(cmsTemplateEntity.getName());
			}else{
			index.setTitle("首页");
			}
			index.setUrl(baseUrl);
			index.setCode("index");
			list.add(index);

			@@ -27,4 +27,12 @@
			and company_id = #{companyId}
			</if>
			</select>

			<select id="selectByPathAndCompanyId" resultType="com.xcong.farmer.cms.modules.system.entity.CmsTemplateEntity">
			select * from cms_template
			where path = #{path}
			<if test="companyId != null and companyId != 0">
			and company_id = #{companyId}
			</if>
			</select>
			</mapper>

	src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java	14 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/xcong/farmer/cms/modules/system/mapper/CmsTemplateMapper.java	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/mapper/CmsTemplateMapper.xml	8 ●●●●● patch \| view \| raw \| blame \| history

			@@ -13,4 +13,6 @@
			int delete(@Param("id") Long id, @Param("companyId") Long companyId);

			CmsTemplateEntity selectByIdAndCompanyId(@Param("id") Long id, @Param("companyId") Long companyId);

			CmsTemplateEntity selectByPathAndCompanyId(@Param("path") String path, @Param("companyId") Long companyId);
			}