Browse Source

作者:张哲
时间:2022/12/1
类型:开发
描述:知识管理列表

ZizgZh 2 năm trước cách đây
mục cha
commit
a38b3ef681

+ 3 - 0
src/main/java/com/redxun/knowledge/entity/vo/KnowledgeVo.java

@@ -68,4 +68,7 @@ public class KnowledgeVo {
 
     // 流程节点
     private List<KnowledgeApprovalVo> approvals;
+
+    //所属分类
+    private KnowledgeCategoryAdminVo knowledgeCategoryAdminVo;
 }

+ 1 - 1
src/main/java/com/redxun/knowledge/service/KnowledgeCategoryServiceImpl.java

@@ -203,7 +203,7 @@ public class KnowledgeCategoryServiceImpl extends SuperServiceImpl<KnowledgeCate
     // 查询父亲节点(递归)
     private KnowledgeCategoryAdminVo findAllParent(String parentId){
         KnowledgeCategoryAdminVo knowledgeCategoryAdminVo = knowledgeCategoryMapper.selectByCategoryId(parentId);
-        if (knowledgeCategoryAdminVo != null){
+        if (knowledgeCategoryAdminVo != null && !("0".equals(knowledgeCategoryAdminVo.getParent()))){
             KnowledgeCategoryAdminVo allParent = findAllParent(knowledgeCategoryAdminVo.getParent());
             knowledgeCategoryAdminVo.setParents(allParent);
         }

+ 10 - 0
src/main/java/com/redxun/knowledge/service/KnowledgeServiceImpl.java

@@ -19,11 +19,13 @@ import com.redxun.knowledge.entity.dao.KnowledgeApprove;
 import com.redxun.knowledge.entity.dao.KnowledgeLabel;
 import com.redxun.knowledge.entity.dto.knowledgeDto;
 import com.redxun.knowledge.entity.vo.KnowledgeApprovalVo;
+import com.redxun.knowledge.entity.vo.KnowledgeCategoryAdminVo;
 import com.redxun.knowledge.entity.vo.KnowledgeVo;
 import com.redxun.knowledge.mapper.KnowledgeApprovalNodeMapper;
 import com.redxun.knowledge.mapper.KnowledgeApproveMapper;
 import com.redxun.knowledge.mapper.KnowledgeMapper;
 import org.checkerframework.checker.units.qual.K;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -51,6 +53,9 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
     @Resource
     private UserService userService;
 
+    @Autowired
+    private KnowledgeCategoryServiceImpl knowledgeCategoryService;
+
     @Override
     public BaseDao<Knowledge> getRepository() {
         return knowledgeMapper;
@@ -177,6 +182,11 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
     public IPage findAllKnowledge(QueryFilter filter) {
         Map<String, Object> params = PageHelper.constructParams(filter);
         IPage page = knowledgeMapper.findAllKnowledge(filter.getPage(), filter.getParams(), params);
+        List<KnowledgeVo> knowledgeVoList = page.getRecords();
+        knowledgeVoList.forEach(e -> {
+            KnowledgeCategoryAdminVo knowledgeCategoryAdminVo = knowledgeCategoryService.findAllParentByCategoryId(e.getCategoryId());
+            e.setKnowledgeCategoryAdminVo(knowledgeCategoryAdminVo);
+        });
         return page;
     }
 }

+ 1 - 1
src/main/resources/mapper/knowledge/KnowledgeMapper.xml

@@ -51,7 +51,7 @@
         </if>
     </select>
 
-    <select id="findAllKnowledge" resultType="com.redxun.knowledge.entity.vo.BannerAdminVo">
+    <select id="findAllKnowledge" resultType="com.redxun.knowledge.entity.vo.KnowledgeVo">
     SELECT
     <include refid="COLUMNS" />
     FROM KM_KNOWLEDGE