作者：张哲

时间：2023/05/12
类型：优化
描述：里程碑(1) 审核流程修改

src/main/java/com/redxun/knowledge/controller/KnowledgeApprovalNodeController.java

@@ -113,6 +113,7 @@ public class KnowledgeApprovalNodeController extends BaseController<KnowledgeApp
             jsonResult.setData(result);
         } catch (Exception e) {
             jsonResult.setMessage(e.getMessage());
+            jsonResult.setSuccess(false);
         }
         return jsonResult;
     }

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

@@ -95,7 +95,6 @@ public class KnowledgeApprovalNodeServiceImpl extends SuperServiceImpl<Knowledge
     public Map<String,Object> insertApprovalNodes(KnowledgeApprovalNodeFlowerDto knowledgeApprovalNodeFlowerDto) throws Exception{
         //修改(清除原本数据)
         if (StringUtils.isNotEmpty(knowledgeApprovalNodeFlowerDto.getPkId())){
-            knowledgeApprovalNodeFlowerMapper.deleteByPkId(knowledgeApprovalNodeFlowerDto.getPkId());
             knowledgeApprovalNodeMapper.deleteByFlowerId(knowledgeApprovalNodeFlowerDto.getPkId());
             knowledgeApprovalNodeCategoryMapper.deleteByFlowerId(knowledgeApprovalNodeFlowerDto.getPkId());
         }
@@ -110,18 +109,22 @@ public class KnowledgeApprovalNodeServiceImpl extends SuperServiceImpl<Knowledge
             }
         });
 
-        KnowledgeApprovalNodeFlower knowledgeApprovalNodeFlower = new KnowledgeApprovalNodeFlower();
+
         //如果名称是默认审核流程,关联分类为默认值
         if (knowledgeApprovalNodeFlowerDto.getFlowerName().equals(flowerName)){
             Set<String> list = new HashSet<>();
             list.add("-2");
             knowledgeApprovalNodeFlowerDto.setCategoryId(list);
-            KnowledgeApprovalNodeFlower knowledgeApprovalNodeFlowerByName = knowledgeApprovalNodeFlowerMapper.selectOne(new LambdaQueryWrapper<KnowledgeApprovalNodeFlower>().eq(KnowledgeApprovalNodeFlower::getFlowerName, flowerName));
-            knowledgeApprovalNodeFlower.setCreateTime(knowledgeApprovalNodeFlowerByName.getCreateTime());
         }
-
+        KnowledgeApprovalNodeFlower knowledgeApprovalNodeFlower = new KnowledgeApprovalNodeFlower();
         knowledgeApprovalNodeFlower.setFlowerName(knowledgeApprovalNodeFlowerDto.getFlowerName());
-        knowledgeApprovalNodeFlowerMapper.insert(knowledgeApprovalNodeFlower);
+        if (StringUtils.isEmpty(knowledgeApprovalNodeFlowerDto.getPkId())){
+            knowledgeApprovalNodeFlowerMapper.insert(knowledgeApprovalNodeFlower);
+        } else {
+            knowledgeApprovalNodeFlower.setPkId(knowledgeApprovalNodeFlowerDto.getPkId());
+            knowledgeApprovalNodeFlowerMapper.updateById(knowledgeApprovalNodeFlower);
+        }
+
         //关联分类
         if (!CollectionUtils.isEmpty(knowledgeApprovalNodeFlowerDto.getCategoryId())){
             knowledgeApprovalNodeFlowerDto.getCategoryId().forEach(e -> {
@@ -136,13 +139,12 @@ public class KnowledgeApprovalNodeServiceImpl extends SuperServiceImpl<Knowledge
         //关联节点
         List<KnowledgeApprovalNodeDto> knowledgeApprovalNodes = knowledgeApprovalNodeFlowerDto.getKnowledgeApprovalNode();
         if (!CollectionUtils.isEmpty(knowledgeApprovalNodes)) {
-            List<KnowledgeApprovalNode> knowledgeApprovalNodeList = knowledgeApprovalNodes.stream().map(e -> {
+            knowledgeApprovalNodes.forEach(e -> {
                 KnowledgeApprovalNode knowledgeApprovalNode = new KnowledgeApprovalNode();
                 BeanUtils.copyProperties(e, knowledgeApprovalNode);
                 knowledgeApprovalNode.setFlowerId(knowledgeApprovalNodeFlower.getPkId());
-                return knowledgeApprovalNode;
-            }).collect(Collectors.toList());
-            this.saveBatch(knowledgeApprovalNodeList);
+                knowledgeApprovalNodeMapper.insert(knowledgeApprovalNode);
+            });
         }
         //返回到前端
         Map<String,Object> result = new HashMap<>();

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

@@ -26,10 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -149,11 +146,13 @@ public class KnowledgeCategoryServiceImpl extends SuperServiceImpl<KnowledgeCate
     public KnowledgeCategoryAdminVo findAllParentByCategoryId(String categoryId) {
         KnowledgeCategoryAdminVo knowledgeCategoryAdminVo = knowledgeCategoryMapper.selectByCategoryId(categoryId);
         // 如果父id等于0，则直接返回(0为顶级分类)
-        if ("0".equals(knowledgeCategoryAdminVo.getParent())) {
-            return knowledgeCategoryAdminVo;
+        if (!Objects.isNull(knowledgeCategoryAdminVo)) {
+            if ("0".equals(knowledgeCategoryAdminVo.getParent())) {
+                return knowledgeCategoryAdminVo;
+            }
+            KnowledgeCategoryAdminVo allParent = findAllParent(knowledgeCategoryAdminVo.getParent());
+            knowledgeCategoryAdminVo.setParents(allParent);
         }
-        KnowledgeCategoryAdminVo allParent = findAllParent(knowledgeCategoryAdminVo.getParent());
-        knowledgeCategoryAdminVo.setParents(allParent);
         return knowledgeCategoryAdminVo;
     }