wbs划分相关

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -648,8 +648,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     && tree.getProjectNodeId().equals(wbsTreeZi.getProjectNodeId())
                     && !tree.getAncestors().equals(wbsTreeZi.getAncestors())) {
 
-                //判断上级节点不同，当前节点名相同的tree选择问题，采用倒序获取最新添加的一条，也就是相同父节点的一条 TODO
-                //第X跨的上级有上部构造现场浇筑、上部构造预制和安装，导致下方新增重复节点判断时找到的是前一个
+                //判断上级节点不同，当前节点名相同的tree选择问题，例如：第X跨的上级有上部构造现场浇筑、上部构造预制和安装，导致下方新增重复节点判断时找到的是前一个
                 wbsTrees.add(tree);
                 break;
             }
@@ -673,22 +672,17 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                 if (wbsTreeZi.getDeptCategory() == 2 || wbsTreeZi.getDeptCategory() == 3
                         || wbsTreeZi.getDeptCategory() == 4 || wbsTreeZi.getDeptCategory() == 5 || wbsTreeZi.getDeptCategory() == 6) {
 
-                    if (tree.getParentId().equals(wbsTreeZi.getParentId())) { //TODO
-
-                        if (!wbsTreeZi.getParentId().equals(tree.getParentId()) && wbsTreeZi.getDeptName().equals(tree.getDeptName())) {
-                            wbsTreeZi.setStatus(1);
-                            wbsTreeZi.setType(1);
-                            wbsTreeZi.setMajorDataType(0);
-                            if (wbsTreeZi.getDeptCategory() == 6) {
-                                wbsTreeZi.setIsConcrete(0);
-                                wbsTreeZi.setIsExpernode(0);
-                                break;
-                            }
+                    if (!wbsTreeZi.getParentId().equals(tree.getParentId()) && wbsTreeZi.getDeptName().equals(tree.getDeptName())) {
+                        wbsTreeZi.setStatus(1);
+                        wbsTreeZi.setType(1);
+                        wbsTreeZi.setMajorDataType(0);
+                        if (wbsTreeZi.getDeptCategory() == 6) {
+                            wbsTreeZi.setIsConcrete(0);
+                            wbsTreeZi.setIsExpernode(0);
+                            break;
                         }
                     }
-
                 }
-
                 wbsTree = tree;
             }
         }