Merge branch 'dev' into dev(milestone2)

src/main/java/com/redxun/knowledge/service/KnowledgeServiceImpl.java

@@ -528,8 +528,6 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
      */
     public IPage getAllKnowledgeByCategoryId(QueryFilter filter) {
         Map<String, Object> params = PageHelper.constructParams(filter);
-
-
         // 工作成果下的知识
         String keyword = (String) filter.getParams().get("keyword");
         if (keyword.equals("working")){
@@ -541,6 +539,8 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
             collect.forEach(g -> {
                 KnowledgeCategoryAdminVo knowledgeCategoryAdminVos = knowledgeCategoryService.findAllParentByCategoryId(g.getCategoryId());
                 g.setKnowledgeCategoryAdminVo(knowledgeCategoryAdminVos);
+                Map<String, Object> maps = userService.querySexAndPhoto(g.getCreateBy());
+                g.setParams(maps);
             });
             return page;
         } else {
@@ -552,52 +552,11 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
             collect.forEach(g -> {
                 KnowledgeCategoryAdminVo knowledgeCategoryAdminVos = knowledgeCategoryService.findAllParentByCategoryId(g.getCategoryId());
                 g.setKnowledgeCategoryAdminVo(knowledgeCategoryAdminVos);
+                Map<String, Object> maps = userService.querySexAndPhoto(g.getCreateBy());
+                g.setParams(maps);
             });
             return page;
         }
-
-
-        //List<KnowledgeVo> knowledgeVoList = page.getRecords();
-        //knowledgeVoList.forEach(e -> {
-        //    KnowledgeCategoryAdminVo knowledgeCategoryAdminVo = knowledgeCategoryService.findAllParentByCategoryId(e.getCategoryId());
-        //    e.setKnowledgeCategoryAdminVo(knowledgeCategoryAdminVo);
-        //});
-        //List<KnowledgeVo> result = new ArrayList<>(knowledgeVoList);
-        //knowledgeVoList.forEach(e -> {
-        //    //把一级分类下的分类的知识加入返回结果集
-        //    KnowledgeCategory knowledgeCategory = knowledgeCategoryMapper.selectById(e.getCategoryId());
-        //    KnowledgeCategoryAdminVo knowledgeCategoryAdminVo = new KnowledgeCategoryAdminVo();
-        //    BeanUtils.copyProperties(knowledgeCategory,knowledgeCategoryAdminVo);
-        //    knowledgeCategoryAdminVo.setLevel(1);
-        //    List<KnowledgeCategoryAdminVo> childrens = knowledgeCategoryService.findChildrens(knowledgeCategoryAdminVo);
-        //    childrens.forEach(children -> {
-        //        List<Knowledge> knowledgeList = this.baseMapper.selectList(new QueryWrapper<Knowledge>().eq("CATEGORY_ID", children.getPkId()));
-        //        List<KnowledgeVo> collect = knowledgeList.stream().map(h -> {
-        //            KnowledgeVo knowledgeVo = new KnowledgeVo();
-        //            BeanUtils.copyProperties(h, knowledgeVo);
-        //            return knowledgeVo;
-        //        }).collect(Collectors.toList());
-        //
-        //        collect.forEach(g -> {
-        //            KnowledgeCategoryAdminVo knowledgeCategoryAdminVos = knowledgeCategoryService.findAllParentByCategoryId(g.getCategoryId());
-        //            g.setKnowledgeCategoryAdminVo(knowledgeCategoryAdminVos);
-        //        });
-        //
-        //        result.addAll(collect);
-        //    });
-        //});
-        //// 按照浏览量降序排序
-        //List<KnowledgeVo> collect = result.stream().
-        //        sorted((t1, t2) -> t2.getViews().compareTo(t1.getViews())).
-        //        map(e -> {
-        //            Map<String, Object> map = userService.querySexAndPhoto(e.getCreateBy());
-        //            e.setParams(map);
-        //            return e;
-        //        }).
-        //        collect(Collectors.toList());
-        //page.setRecords(collect);
-        //page.setTotal(collect.size());
-        // return page;
     }
 
     /**