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