隐藏表单

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

@@ -1297,7 +1297,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
     }
 
     /**
-     * 反向递归获取父级（父级Id=子级parentId）
+     * 构造从最底层节点获取他的所有父级，并统计出现次数（父级Id=子级parentId）
      *
      * @param result              结果集
      * @param lowestNodeParentIds 最底层节点ParentIds
@@ -1355,6 +1355,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 
     /**
      * 反向递归处理父节点颜色
+     * （暂未解决父级颜色问题，因为按照这个方法构造出来的父级颜色，颜色会断层；目前上级统一显示蓝色，最底层填报数据显示上报审批状态的颜色）
      */
     private void recursiveParentNodeColorStatus(List<WbsTreeContractLazyVO> childNodeTBList, Map<Long, WbsTreeContractLazyVO> distinctParentNodesTBIdKeyMap, Map<Long, List<WbsTreeContractLazyVO>> allNodesParentGroup, Map<Long, WbsTreeContractLazyVO> nodeColorMap) {
         if (childNodeTBList.size() > 0) {

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

@@ -1617,6 +1617,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                         if (tabs.size() > 0) {
                             List<WbsTreeContract> wbsTreeContractList = BeanUtil.copyProperties(tabs, WbsTreeContract.class);
                             for (WbsTreeContract wbsTreeContract : wbsTreeContractList) {
+                                wbsTreeContract.setIsBussShow(1);
                                 wbsTreeContract.setIsDeleted(0);
                                 wbsTreeContract.setStatus(1);
                                 wbsTreeContract.setPKeyId(SnowFlakeUtil.getId());
@@ -1631,6 +1632,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                         if (tabs.size() > 0) {
                             List<WbsTreeContract> wbsTreeContractList = BeanUtil.copyProperties(tabs, WbsTreeContract.class);
                             for (WbsTreeContract wbsTreeContract : wbsTreeContractList) {
+                                wbsTreeContract.setIsBussShow(1);
                                 wbsTreeContract.setIsDeleted(0);
                                 wbsTreeContract.setStatus(1);
                                 wbsTreeContract.setPKeyId(SnowFlakeUtil.getId());