Merge remote-tracking branch 'origin/test-merge' into test-merge

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/WbsTreeContractStatisticsServiceImpl.java

@@ -144,7 +144,7 @@ public class WbsTreeContractStatisticsServiceImpl extends ServiceImpl<WbsTreeCon
             return this.updateIsDeleted(wbsTreeContractPkeyId, isDelete);
         }
         WbsTreeContract wbsTreeContract = getWbsTreeContractByPKeyId(wbsTreeContractPkeyId);
-        if (wbsTreeContract == null) {
+        if (wbsTreeContract == null || wbsTreeContract.getIsDeleted() != 0 || wbsTreeContract.getStatus() != 1 || wbsTreeContract.getType() != 1) {
             return false;
         }
         WbsTreeContractStatistics wbsTreeContractStatistics = this.getById(wbsTreeContractPkeyId);
@@ -239,7 +239,7 @@ public class WbsTreeContractStatisticsServiceImpl extends ServiceImpl<WbsTreeCon
         WbsTreeContractStatistics parent = this.getById(wbsTreeContractStatistics.getParentId());
         if (parent == null) {
             WbsTreeContract wbsTreeContractParent = getWbsTreeContractByPKeyId(wbsTreeContractStatistics.getParentId());
-            if (wbsTreeContractParent == null) {
+            if (wbsTreeContractParent == null || wbsTreeContractParent.getIsDeleted() != 0 || wbsTreeContractParent.getStatus() != 1) {
                 return;
             }
             parent = createWbsTreeContractStatistics(wbsTreeContractParent);