提交 401cb331 作者: 布红亮

查询新增全部和其他查询-排除国内的

上级 91d87531
...@@ -5,4 +5,8 @@ public class CommonConstants { ...@@ -5,4 +5,8 @@ public class CommonConstants {
* 智库性质字典key * 智库性质字典key
*/ */
public static final String DIC_THINK_TANK_NATURE = "think_tank_nature"; public static final String DIC_THINK_TANK_NATURE = "think_tank_nature";
/**
* 国家中国id
*/
public static final String CHINA_ID = "1405761925932109826";
} }
...@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.zzsn.thinktank.constants.CommonConstants; import com.zzsn.thinktank.constants.CommonConstants;
import com.zzsn.thinktank.entity.*; import com.zzsn.thinktank.entity.*;
...@@ -360,11 +361,13 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf ...@@ -360,11 +361,13 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
if (StringUtils.equals(thinktankBasicInfoListVo.getQueryType(), "all")) { if (StringUtils.equals(thinktankBasicInfoListVo.getQueryType(), "all")) {
cacheTypeStr = "all"; cacheTypeStr = "all";
thinktankBasicInfoListVo.setTypeId(null); thinktankBasicInfoListVo.setTypeId(null);
thinktankBasicInfoListVo.setExcludeTypeIds(null); // 排除中国的
thinktankBasicInfoListVo.setExcludeTypeIds(Lists.newArrayList(CommonConstants.CHINA_ID));
} else if (StringUtils.equals(thinktankBasicInfoListVo.getQueryType(), "other")) { } else if (StringUtils.equals(thinktankBasicInfoListVo.getQueryType(), "other")) {
// 其它-排除热门的 // 其它-排除热门的
cacheTypeStr = thinktankBasicInfoListVo.getExcludeTypeIds().toString(); cacheTypeStr = thinktankBasicInfoListVo.getExcludeTypeIds().toString();
thinktankBasicInfoListVo.setTypeId(null); thinktankBasicInfoListVo.setTypeId(null);
thinktankBasicInfoListVo.getExcludeTypeIds().add(CommonConstants.CHINA_ID);
} else { } else {
thinktankBasicInfoListVo.setExcludeTypeIds(null); thinktankBasicInfoListVo.setExcludeTypeIds(null);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论