|
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.redxun.common.base.db.BaseDao;
|
|
|
import com.redxun.common.base.db.BaseService;
|
|
|
import com.redxun.common.base.db.PageHelper;
|
|
|
+import com.redxun.common.base.entity.BaseEntity;
|
|
|
import com.redxun.common.base.search.QueryFilter;
|
|
|
import com.redxun.common.service.impl.SuperServiceImpl;
|
|
|
import com.redxun.common.tool.BeanUtil;
|
|
@@ -13,9 +14,11 @@ import com.redxun.common.tool.IdGenerator;
|
|
|
import com.redxun.knowledge.entity.dao.KnowledgeCategory;
|
|
|
import com.redxun.knowledge.entity.vo.KnowledgeCategoryAdminVo;
|
|
|
import com.redxun.knowledge.mapper.KnowledgeCategoryMapper;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import java.io.Serializable;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -41,7 +44,6 @@ public class KnowledgeCategoryServiceImpl extends SuperServiceImpl<KnowledgeCate
|
|
|
KnowledgeCategory knowledgeCategory = knowledgeCategoryMapper.selectById(categoryId);
|
|
|
Boolean hasChild = findHasChirld(knowledgeCategory);
|
|
|
knowledgeCategory.setHasChild(hasChild);
|
|
|
-
|
|
|
if (hasChild){
|
|
|
List<KnowledgeCategory> allChildren = findAllChildren(knowledgeCategory);
|
|
|
knowledgeCategory.setChildren(allChildren);
|
|
@@ -132,6 +134,26 @@ public class KnowledgeCategoryServiceImpl extends SuperServiceImpl<KnowledgeCate
|
|
|
return this.getRepository().updateById(entity);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public KnowledgeCategory get(Serializable id) {
|
|
|
+ KnowledgeCategory knowledgeCategory = this.getRepository().selectById(id);
|
|
|
+ return knowledgeCategory;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 根据id进行数据回显
|
|
|
+ * @param pkId
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public KnowledgeCategoryAdminVo findByCategoryId(String pkId) {
|
|
|
+ KnowledgeCategoryAdminVo knowledgeCategoryAdminVo = knowledgeCategoryMapper.selectByCategoryId(pkId);
|
|
|
+ KnowledgeCategoryAdminVo allParent = findAllParent(knowledgeCategoryAdminVo.getParent());
|
|
|
+ knowledgeCategoryAdminVo.setParents(allParent);
|
|
|
+ return knowledgeCategoryAdminVo;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
// 查询孩子节点(非递归)
|
|
|
private List<KnowledgeCategory> findAllChildren(KnowledgeCategory knowledgeCategory) {
|
|
|
QueryWrapper<KnowledgeCategory> queryWrapper = new QueryWrapper<>();
|