Merge remote-tracking branch 'origin/master'

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

@@ -570,6 +570,9 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                     if (wbsContract != null) {
                         wbsContract.setContractId(String.valueOf(contractInfo.getId()));
                         wbsContract.setProjectId(projectId);
+                        wbsContract.setClassName(wbsTreePrivate.getClassName());
+                        wbsContract.setUnitName(wbsTreePrivate.getUnitName());
+                        wbsContract.setIsClassifition(wbsTreePrivate.getIsClassifition());
                         listContract.add(wbsContract);
                     }
                 }
@@ -682,6 +685,9 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                         if (wbsContract != null) {
                             wbsContract.setContractId(id.toString());
                             wbsContract.setProjectId(projectId);
+                            wbsContract.setClassName(wbsTreePrivate.getClassName());
+                            wbsContract.setUnitName(wbsTreePrivate.getUnitName());
+                            wbsContract.setIsClassifition(wbsTreePrivate.getIsClassifition());
                             listContract.add(wbsContract);
                         }
                     }
@@ -744,6 +750,9 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                 || !Objects.equals(nonNull(a.getMixRatioTestIds()), nonNull(b.getMixRatioTestIds()))
                 || !Objects.equals(nonNull(a.getInitTableId()), nonNull(b.getInitTableId()))
                 || !Objects.equals(nonNull(a.getInitTableName()), nonNull(b.getInitTableName()))
+                || !Objects.equals(nonNull(a.getClassName()), nonNull(b.getClassName()))
+                || !Objects.equals(nonNull(a.getUnitName()), nonNull(b.getUnitName()))
+                || !Objects.equals(nonNull(a.getIsClassifition()), nonNull(b.getIsClassifition()))
                 || !Objects.equals(a.getSort(), b.getSort());
     }
 

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

@@ -676,7 +676,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                             WbsTreePrivate::getNodeName, WbsTreePrivate::getFullName,
                             WbsTreePrivate::getNodeType, WbsTreePrivate::getMajorDataType, WbsTreePrivate::getTableType, WbsTreePrivate::getTableOwner,
                             WbsTreePrivate::getImportMatchingInfo, WbsTreePrivate::getMixRatioTestIds, WbsTreePrivate::getInitTableId,
-                            WbsTreePrivate::getInitTableName, WbsTreePrivate::getSort, WbsTreePrivate::getHtmlUrl, WbsTreePrivate::getExcelId)
+                            WbsTreePrivate::getInitTableName, WbsTreePrivate::getSort, WbsTreePrivate::getHtmlUrl, WbsTreePrivate::getExcelId,
+                            WbsTreePrivate::getClassName,WbsTreePrivate::getUnitName,WbsTreePrivate::getIsClassifition)
                     .in(WbsTreePrivate::getParentId, ids)
                     .eq(WbsTreePrivate::getProjectId, obj.getProjectId())
                     .eq(WbsTreePrivate::getWbsId, obj.getWbsId())