Merge branch 'dev' into dev(milestone2)

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

@@ -386,50 +386,6 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
             Map<String, Object> map = userService.querySexAndPhoto(e.getCreateBy());
             e.setParams(map);
         });
-        // 有分类Id为参数的情况下
-        if (params.containsKey("categoryId")){
-            List<KnowledgeVo> knowledgeVoListIncludeCategoryId = new ArrayList<>();
-            knowledgeVoListIncludeCategoryId.addAll(knowledgeVoList);
-            KnowledgeCategoryAdminVo knowledgeCategoryAdminVo = knowledgeCategoryService.getAllByCategoryId((String) params.get("categoryId"));
-            List<KnowledgeCategoryAdminVo> children = knowledgeCategoryAdminVo.getChildren();
-            if (children != null){
-                children.forEach(e -> {
-                    // 把分类下的孩子节点放入结果集中
-                    List<Knowledge> knowledges = knowledgeMapper.
-                            selectList(new QueryWrapper<Knowledge>().eq("CATEGORY_ID", e.getPkId()).eq("APPROVAL_STATUS",5));
-                    List<KnowledgeVo> collectTwo = knowledges.parallelStream().map(h -> {
-                        KnowledgeVo knowledgeVo = new KnowledgeVo();
-                        BeanUtils.copyProperties(h, knowledgeVo);
-                        return knowledgeVo;
-                    }).collect(Collectors.toList());
-                    knowledgeVoListIncludeCategoryId.addAll(collectTwo);
-
-                    List<KnowledgeCategoryAdminVo> childrenThree = e.getChildren();
-                    if (childrenThree != null){
-                        childrenThree.forEach(g -> {
-                            List<Knowledge> knowledgeThree = knowledgeMapper.
-                                    selectList(new QueryWrapper<Knowledge>().eq("CATEGORY_ID", g.getPkId()).eq("APPROVAL_STATUS",5));
-                            List<KnowledgeVo> collectThree = knowledges.parallelStream().map(h -> {
-                                KnowledgeVo knowledgeVo = new KnowledgeVo();
-                                BeanUtils.copyProperties(h, knowledgeVo);
-                                return knowledgeVo;
-                            }).collect(Collectors.toList());
-                            knowledgeVoListIncludeCategoryId.addAll(collectThree);
-                        });
-                    }
-                });
-            }
-            List<KnowledgeVo> collect = knowledgeVoListIncludeCategoryId.stream().
-                    sorted((t1, t2) -> t2.getCreateTime().compareTo(t1.getCreateTime())).collect(Collectors.toList());
-            collect.forEach(e -> {
-                KnowledgeCategoryAdminVo knowledgeCategoryAdminVos = knowledgeCategoryService.findAllParentByCategoryId(e.getCategoryId());
-                e.setKnowledgeCategoryAdminVo(knowledgeCategoryAdminVos);
-                e.setOperatorName(userService.queryUser(e.getUpdateBy()).getFullName());
-                Map<String, Object> map = userService.querySexAndPhoto(e.getCreateBy());
-                e.setParams(map);
-            });
-            return PageListUtils.getPages(filter.getPage().getCurrent(), filter.getPage().getSize(), collect);
-        }
         return page;
     }
 

src/main/resources/mapper/knowledge/BannerMapper.xml

@@ -47,30 +47,32 @@
 
     <select id="findAllBanner" resultType="com.redxun.knowledge.entity.vo.BannerAdminVo">
         SELECT
-        <include refid="COLUMNS" />
-        FROM KM_BANNER
+        kb.PK_ID,kb.TYPE,kb.NAME,kb.SUMMARY,kb.BANNER_FILE,kb.KNOWLEDGE_ID,kb.SORT,
+        kb.ENABLED,kb.IS_DEL,kb.COMPANY_ID_,kb.CREATE_DEP_ID_,kb.TENANT_ID_,
+        kb.CREATE_BY_,kb.CREATE_TIME_,kb.UPDATE_BY_,kb.UPDATE_TIME_
+        FROM KM_BANNER kb JOIN LEARNING_USER_DEV.OS_USER users ON kb.UPDATE_BY_ = users.USER_ID_
         <where>
             <if test="@rx.Ognl@isNotEmpty(params.name)">
-                NAME LIKE '%' || #{params.name} || '%'
+                kb.NAME LIKE '%' || #{params.name} || '%'
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.type)">
-                and TYPE = #{params.type}
+                and kb.TYPE = #{params.type}
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.enabled)">
-                and ENABLED = #{params.enabled}
+                and kb.ENABLED = #{params.enabled}
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.createBy)">
-                and CREATE_BY_ LIKE '%' || #{params.createBy} || '%'
+                and users.FULLNAME_ LIKE '%' || #{params.createBy} || '%'
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.beginTime)">
-                and TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.beginTime}
+                and TO_CHAR(kb.CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.beginTime}
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.endTime)">
-                and TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') &lt;= #{params.endTime}
+                and TO_CHAR(kb.CREATE_TIME_,'yyyy-mm-dd') &lt;= #{params.endTime}
             </if>
-            and IS_DEL = 0
+            and kb.IS_DEL = 0
         </where>
-        ORDER BY SORT ASC ,ENABLED DESC
+        ORDER BY kb.SORT ASC ,kb.ENABLED DESC
     </select>
 
     <delete id="deleteBanner">

src/main/resources/mapper/knowledge/KnowledgeApproveMapper.xml

@@ -61,7 +61,9 @@
                 k.TITLES LIKE '%' || #{params.titles} || '%'
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.categoryId)">
-                and k.CATEGORY_ID = #{params.categoryId}
+                and k.CATEGORY_ID IN (
+                SELECT c.PK_ID FROM KM_KNOWLEDGE_CATEGORY c START WITH c.PK_ID = #{params.categoryId} CONNECT BY PRIOR c.PK_ID = c.PARENT
+                )
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.type)">
                 and k.TYPE = #{params.type}

src/main/resources/mapper/knowledge/KnowledgeMapper.xml

@@ -68,7 +68,9 @@
                 and TITLES LIKE '%' || #{params.titles} || '%'
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.categoryId)">
-                and CATEGORY_ID = #{params.categoryId}
+                and CATEGORY_ID IN (
+                SELECT c.PK_ID FROM KM_KNOWLEDGE_CATEGORY c START WITH c.PK_ID = #{params.categoryId} CONNECT BY PRIOR c.PK_ID = c.PARENT
+                )
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.type)">
                 and TYPE = #{params.type}
@@ -121,7 +123,9 @@
                 k.TITLES LIKE '%' || #{params.titles} || '%'
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.categoryId)">
-                k.CATEGORY_ID = #{params.categoryId}
+                k.CATEGORY_ID IN (
+                SELECT c.PK_ID FROM KM_KNOWLEDGE_CATEGORY c START WITH c.PK_ID = #{params.categoryId} CONNECT BY PRIOR c.PK_ID = c.PARENT
+                )
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.type)">
                 and k.TYPE = #{params.type}
@@ -151,7 +155,8 @@
         WHERE
         k.CATEGORY_ID IN (
         SELECT c.PK_ID FROM KM_KNOWLEDGE_CATEGORY c START WITH c.PK_ID = #{params.categoryId} CONNECT BY PRIOR c.PK_ID = c.PARENT
-        ) ORDER BY CREATE_TIME_
+        ) and k.APPROVAL_STATUS = 5
+        ORDER BY VIEWS DESC
     </select>
 
     <update id="updateApprovalStatus">