|
@ -662,7 +662,7 @@ public class BaseMenuManageService {
|
|
|
return list;
|
|
|
}
|
|
|
|
|
|
public MixEnvelop findArticleByMenuId(String menuId,Integer page,Integer pageSize){
|
|
|
public MixEnvelop findArticleByMenuId(String menuId,String title,Integer page,Integer pageSize){
|
|
|
Pageable pageRequest = PageRequest.of(page-1,pageSize);
|
|
|
List<String> menuIds = new ArrayList<>();
|
|
|
if (StringUtils.isNoneBlank(menuId)){
|
|
@ -673,15 +673,21 @@ public class BaseMenuManageService {
|
|
|
}
|
|
|
|
|
|
System.out.print("menuId"+menuId);
|
|
|
List<KnowledgeArticleDictDO> list=knowledgeArticleDictDao.findByCategorySecondAndPage(menuIds,pageRequest);
|
|
|
|
|
|
Integer count;
|
|
|
List<KnowledgeArticleDictDO> list;
|
|
|
if(StringUtils.isNotBlank(title)){
|
|
|
count = knowledgeArticleDictDao.getCountByCategorySecond(menuIds,title);
|
|
|
list=knowledgeArticleDictDao.findByCategorySecondAndPage(menuIds,title,pageRequest);
|
|
|
}else {
|
|
|
count = knowledgeArticleDictDao.getCountByCategorySecond(menuIds);
|
|
|
list=knowledgeArticleDictDao.findByCategorySecondAndPage(menuIds,pageRequest);
|
|
|
}
|
|
|
List<KnowledgeArticleDictDO> listnew = new ArrayList<>();
|
|
|
BeanUtils.copyProperties(listnew,list);
|
|
|
for (KnowledgeArticleDictDO dictDO:list){
|
|
|
dictDO.setContent(null);
|
|
|
}
|
|
|
|
|
|
Integer count = knowledgeArticleDictDao.getCountByCategorySecond(menuIds);
|
|
|
MixEnvelop mixEnvelop = new MixEnvelop();
|
|
|
mixEnvelop.setTotalCount(count);
|
|
|
mixEnvelop.setDetailModelList(list);
|