Commit d04fe0a6 by 朱亚洁

bug:[1027812]系列书分类

parent 3c9d55d2
...@@ -3711,7 +3711,7 @@ public class BookBizImpl implements BookBiz { ...@@ -3711,7 +3711,7 @@ public class BookBizImpl implements BookBiz {
return map; return map;
} }
//k12教育分类校验 //k12教育分类校验
List<Long> templetIds = Arrays.asList(RightsSettingConstant.K12_VERSION_ID); List<Long> templetIds = Arrays.asList(RightsSettingConstant.K12_TEMPLET_ID_NEW);
// 如果不是k12分类,则无系列书 // 如果不是k12分类,则无系列书
if(!templetIds.contains(bookAdviserDto.getTempletId())){ if(!templetIds.contains(bookAdviserDto.getTempletId())){
return map; return map;
......
...@@ -443,7 +443,7 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz { ...@@ -443,7 +443,7 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz {
public Page<ESBookAndAdviser> getAdviserBooks4SeriesBook(List<String> keywords, Integer currentPage, Integer numPerPage, List<Long> adviserIds, public Page<ESBookAndAdviser> getAdviserBooks4SeriesBook(List<String> keywords, Integer currentPage, Integer numPerPage, List<Long> adviserIds,
Long agentId, Long subLabelId, Long graLabelId, String serialNumber) { Long agentId, Long subLabelId, Long graLabelId, String serialNumber) {
//k12教育分类校验 //k12教育分类校验
List<Long> templetIds = Arrays.asList(RightsSettingConstant.K12_VERSION_ID); List<Long> templetIds = Arrays.asList(RightsSettingConstant.K12_TEMPLET_ID_NEW);
BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery() BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery()
.filter(QueryBuilders.termQuery("isBookDelete", 0)) .filter(QueryBuilders.termQuery("isBookDelete", 0))
.filter(QueryBuilders.termQuery("isBookAdviserDelete", 0)) .filter(QueryBuilders.termQuery("isBookAdviserDelete", 0))
......
...@@ -24,10 +24,6 @@ public class RightsSettingConstant { ...@@ -24,10 +24,6 @@ public class RightsSettingConstant {
*/ */
public static final Long[] K12_VOLUME_ID = {48L, 59L, 46L, 40L, 65L, 10L, 60L}; public static final Long[] K12_VOLUME_ID = {48L, 59L, 46L, 40L, 65L, 10L, 60L};
/** /**
* 所属k12教育/学前教育的书刊分类id---有版本分类
*/
public static final Long[] K12_VERSION_ID = {48L, 59L, 46L, 40L, 65L, 73L, 60L};
/**
* 医疗保健编辑书刊分类id * 医疗保健编辑书刊分类id
*/ */
public static final Long[] MEDICAL_INSURANCE_TEMPLET_ID = {63L}; public static final Long[] MEDICAL_INSURANCE_TEMPLET_ID = {63L};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment