修改dd rd 默认配置,附件错误不中断.

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/DumpRestoreData.java

@@ -22,8 +22,8 @@ public class DumpRestoreData extends ConfigObject {
 	public static final String RESTOREOVERRIDE_CLEAN = "clean";
 	public static final String RESTOREOVERRIDE_SKIPEXISTED = "skipExisted";
 
-	public static final Boolean DEFAULT_REDISTRIBUTE = true;
-	public static final Boolean DEFAULT_EXCEPTIONINVALIDSTORAGE = true;
+	public static final Boolean DEFAULT_REDISTRIBUTE = false;
+	public static final Boolean DEFAULT_EXCEPTIONINVALIDSTORAGE = false;
 	public static final Boolean DEFAULT_ATTACHSTORAGE = true;
 	public static final String DEFAULT_ITEMCATEGORY = "";
 	public static final Boolean DEFAULT_PARALLEL = true;

o2server/x_console/src/main/java/com/x/server/console/action/DumpData.java

@@ -222,10 +222,13 @@ public class DumpData {
                 StorageObject s = (StorageObject) t;
                 String name = s.getStorage();
                 StorageMapping mapping = storageMappings.get(s.getClass(), name);
-				if (null == mapping && Config.dumpRestoreData().getExceptionInvalidStorage()) {
+                if (null == mapping) {
+                    if (BooleanUtils.isTrue(Config.dumpRestoreData().getExceptionInvalidStorage())) {
                         throw new ExceptionInvalidStorage(s);
+                    } else {
+                        LOGGER.warn("can not access storage:{}.", s);
                     }
-				if (null != mapping) {
+                } else {
                     Path p = sub.resolve(FilenameUtils.getName(s.path()));
                     if (s.existContent(mapping)) {
                         try (OutputStream out = Files.newOutputStream(p)) {

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AeiObjects.java

@@ -300,7 +300,10 @@ public class AeiObjects extends GsonPropertyObject {
 
     public List<Route> getRoutes() throws Exception {
         if (null == this.routes) {
-            this.routes = this.business.element().listRouteWithActvity(work.getActivity(), work.getActivityType());
+            List<Route> os = this.business.element().listRouteWithActvity(work.getActivity(), work.getActivityType());
+            this.routes = os.stream().sorted(Comparator.nullsLast(
+                    Comparator.comparing(Route::getOrderNumber, Comparator.nullsLast(Comparator.naturalOrder()))))
+                    .collect(Collectors.toList());
         }
         return this.routes;
     }