diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 99ae7e92..0f057bc8 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -172,7 +172,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { }else { boolQueryBuilder.must(boolQueryShould); } - searchRequestBuilder.setQuery(boolQueryBuilder); + searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true); //在结果中检索 if (StringUtils.isNotEmpty(searchInfoEO.getResultKeyword()) && StringUtils.isNotBlank(searchInfoEO.getIsHigh())) { QueryBuilder multiQuery = queryInResult(searchInfoEO); @@ -310,7 +310,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryBuilder.must(multiQuery); } - searchRequestBuilder.setQuery(boolQueryBuilder); + searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true); // 获取查询到的结果 result = countStandSearchResult(searchRequestBuilder,searchInfoEO); @@ -1110,7 +1110,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { // boolQueryBuilder.must(QueryBuilders.matchQuery("valid_flag", 0)); // boolQueryBuilder.should(boolQueryBuilderShould); - searchRequestBuilder.setQuery(boolQueryBuilder); + searchRequestBuilder.setQuery(boolQueryBuilder).setTrackTotalHits(true); // 获取查询到的结果 SearchResponse response = searchRequestBuilder.get(); for (SearchHit searchHit : response.getHits().getHits()) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java index de959ae0..223bbb93 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarResource.dao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; import java.util.HashMap; import java.util.List; @@ -14,6 +15,7 @@ import java.util.List; * @author zyl * @since 2021-06-30 */ +@Repository public interface TsResourceDao extends BaseMapper { List queryMenuByDis(TsResource sarMenuEO); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index d1e8776f..eda369a2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -151,6 +151,10 @@ public class TsResourceServiceImpl extends ServiceImpl list = new ArrayList<>(); + list.add("INLAND_STAND"); + list.add("FOREIGN_STAND"); + tsResourceQueryWrapper.notIn("SOR_DIVIDE",list); tsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); List TsResources=dao.selectList(tsResourceQueryWrapper); for(TsResource TsResource:TsResources){ @@ -181,7 +185,7 @@ public class TsResourceServiceImpl extends ServiceImpl */ - private List recursionGetListChildren(TsResource parent,List getMenuIdList){ + private List recursionGetListChildren(String sorDivide,TsResource parent,List getMenuIdList){ QueryWrapper TsResourceQueryWrapper=new QueryWrapper<>(); TsResourceQueryWrapper.eq("PARENT_ID",parent.getId()); - TsResourceQueryWrapper.in("ID",getMenuIdList); + if(StringUtils.isNotBlank(sorDivide)){ + if(!sorDivide.equals("INLAND_STAND") && !sorDivide.equals("FOREIGN_STAND")){ + TsResourceQueryWrapper.in("ID",getMenuIdList); + } + } TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ"); List children=dao.selectList(TsResourceQueryWrapper); for(TsResource TsResource:children){ - TsResource.setChildren(recursionGetListChildren((TsResource),(getMenuIdList))); + TsResource.setChildren(recursionGetListChildren((sorDivide),(TsResource),(getMenuIdList))); } return children; }