代码修改

svr/svr-base/src/main/java/com/yihu/jw/base/dao/article/KnowledgeArticleDictDao.java

@@ -33,8 +33,15 @@ public interface KnowledgeArticleDictDao extends JpaRepository<KnowledgeArticleD
	Integer getCountByCategoryFirst(String category);
	@Query(" select count(*) from KnowledgeArticleDictDO a where a.del=1 and  a.categorySecond IN (?1) and a.releaseStatus=1")
	Integer getCountByCategorySecond(List<String> category);
	@Query(" select count(*) from KnowledgeArticleDictDO a where a.del=1 and  a.categorySecond IN (?1) and a.releaseStatus=1 and a.title like %?2%")
	Integer getCountByCategorySecond(List<String> category,String title);
	@Query("select a from KnowledgeArticleDictDO a where a.del=1 and  a.categorySecond IN ( ?1 ) and a.releaseStatus=1 order by  a.releaseTime desc,a.createTime desc ")
	List<KnowledgeArticleDictDO> findByCategorySecondAndPage(List<String> category,Pageable pageRequest);
	@Query("select a from KnowledgeArticleDictDO a where a.del=1 and  a.categorySecond IN ( ?1 ) and a.releaseStatus=1 and a.title like %?2% order by  a.releaseTime desc,a.createTime desc ")
	List<KnowledgeArticleDictDO> findByCategorySecondAndPage(List<String> category,String title,Pageable pageRequest);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/menu/BaseMenuNoLoginEndpoint.java

@@ -61,12 +61,14 @@ public class BaseMenuNoLoginEndpoint extends EnvelopRestEndpoint {
    public Envelop findArticleByMenuid(
            @ApiParam(name = "menuId", value = "menuId", required = false)
            @RequestParam(value = "menuId",required = true) String menuId,
            @ApiParam(name = "title", value = "menuId", required = false)
            @RequestParam(value = "title",required = false) String title,
            @ApiParam(name = "page", value = "page", required = false)
            @RequestParam(value = "page",required = true) Integer page,
            @ApiParam(name = "pageSize", value = "pageSize", required = false)
            @RequestParam(value = "pageSize",required = true) Integer pageSize) {
        try {
            return success(menuService.findArticleByMenuId(menuId,page,pageSize));
            return success(menuService.findArticleByMenuId(menuId,title,page,pageSize));
        }catch (Exception e){
            return failedException(e);
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/menu/BaseMenuManageService.java

@@ -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);