farmer-cms.git - Gitblit

			@@ -156,7 +156,6 @@
			Long companyId = LoginUserUtil.getCompanyId();
			QueryWrapper<CmsTemplateEntity> objectQueryWrapper = new QueryWrapper<>();
			objectQueryWrapper.eq("company_id",companyId);
			objectQueryWrapper.eq("company_id",companyId);
			List<CmsTemplateEntity> cmsTemplateEntities = this.baseMapper.selectList(objectQueryWrapper);
			return Result.ok(cmsTemplateEntities);
			}
			@@ -166,12 +165,9 @@

			@Override
			public Result viewTemplateInfo(Long id) {
			Long companyId = LoginUserUtil.getCompanyId();
			CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectById(id);
			String baseUrl = cmsProperties.getBaseUrl();
			String templatePath = cmsProperties.getTemplatePath();
			String htmlUrl = baseUrl + templatePath;
			String pathName = htmlUrl + "/" + cmsTemplateEntity.getPath();
			String pathName = FileUtils.path(templatePath, cmsTemplateEntity.getPath());

			byte[] bytes = new byte[0];
			try {

			@@ -11,7 +11,7 @@
			<where>
			and a.id not in (
			SELECT b.user_id FROM t_user_role b
			WHERE b.role_id = ( SELECT id FROM t_role WHERE role_name = #{record.roleName})
			WHERE b.role_id in ( SELECT id FROM t_role WHERE role_name = #{record.roleName})
			)
			<if test="record != null" >
			<if test="record.username!=null">

			@@ -2,9 +2,11 @@

			import cn.hutool.core.util.ObjectUtil;
			import com.xcong.farmer.cms.common.response.Result;
			import com.xcong.farmer.cms.common.utils.FileUtils;
			import com.xcong.farmer.cms.configurations.properties.CmsProperties;
			import com.xcong.farmer.cms.modules.system.entity.CmsTemplateEntity;
			import com.xcong.farmer.cms.modules.system.mapper.CmsTemplateMapper;
			import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
			import com.xcong.farmer.cms.modules.test.dao.TestUserDao;
			import com.xcong.farmer.cms.modules.test.entity.TestUserEntity;
			import org.jsoup.Jsoup;
			@@ -80,4 +82,14 @@
			System.out.println(content);
			}

			@Test
			public void path(){
			Long id = 6L;
			CmsTemplateEntity cmsTemplateEntity = cmsTemplateMapper.selectById(id);
			String templatePath = cmsProperties.getTemplatePath();
			String pathName = FileUtils.path(templatePath, cmsTemplateEntity.getPath());
			System.out.println(templatePath);
			System.out.println(pathName);
			}

			}

	src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java	6 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/mapper/UserMapper.xml	2 ●●●●● patch \| view \| raw \| blame \| history
	src/test/java/com/xcong/farmer/cms/KssframeworkApplicationTests.java	12 ●●●●● patch \| view \| raw \| blame \| history