farmer-cms.git - Gitblit

			@@ -1,6 +1,7 @@
			package com.xcong.farmer.cms.modules.system.service.Impl;

			import cn.hutool.core.collection.CollUtil;
			import cn.hutool.core.date.DateUtil;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.core.toolkit.StringPool;
			@@ -286,6 +287,10 @@
			if(UserEntity.USER_BELONG_TOP != companyId){
			articleEntity.setCompanyId(companyId);
			}
			String timeType = webArticleInPageDto.getTimeType();
			if(StrUtil.isNotEmpty(timeType)){
			articleEntity.setTimeType(timeType);
			}
			IPage<WebArticleVo> list = this.baseMapper.selectWebArticleInPage(page,articleEntity);
			return Result.ok(list);
			}