瀏覽代碼

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 年之前
父節點
當前提交
5c47a07fb8

+ 4 - 0
src/main/java/com/persagy/proxy/migration/handler/ObjectDigitalMigration.java

@@ -376,6 +376,10 @@ public class ObjectDigitalMigration extends MigrationAbstractServiceImpl<ObjectD
                 syncData.setTargetId(digital.getId());
                 syncData.setLocalId(digital.getLocalId());
                 syncData.setLocalName(digital.getLocalName());
+                if(StrUtil.isNotEmpty(digital.getMark())){
+                    syncData.setError(digital.getMark());
+                    syncData.setSign(1);
+                }
                 syncDataList.add(syncData);
             }
         }

+ 2 - 1
src/main/java/com/persagy/proxy/migration/service/Impl/MigrationAbstractServiceImpl.java

@@ -371,8 +371,9 @@ public class MigrationAbstractServiceImpl<T> implements MigrationAbstractService
         for(String msg : errorMsg){
             SyncData syncData = new SyncData();
             syncData.setTableName(tableName);
-            syncData.setTargetId("error");
+            //syncData.setTargetId("error");
             syncData.setError(msg);
+            syncData.setSign(1);
             syncDataList.add(syncData);
         }
         return syncDataList;