Prechádzať zdrojové kódy

Merge branch 'hostfix_v0.4.0' of http://39.106.8.246:3003/BDTP/digital-delivery into hostfix_v0.4.0

lijie 3 rokov pred
rodič
commit
23bc2ffbc5

+ 5 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/MigrationAbstractServiceImpl.java

@@ -464,7 +464,11 @@ public class MigrationAbstractServiceImpl<T> implements IMigrationAbstractServic
             return  null;
         }
         Map<String, Object> targetsMap = new HashMap<>(sets.size());
-        sets.forEach(key -> targetsMap.put(key, map.get(key)));
+        for(String key : sets){
+            if(map.containsKey(key)){
+                targetsMap.put(key, map.get(key));
+            }
+        }
         return targetsMap;
     }
 }

+ 0 - 1
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/ObjectDigitalMigration.java

@@ -202,7 +202,6 @@ public class ObjectDigitalMigration extends MigrationAbstractServiceImpl<ObjectD
             log.error(" ######################### dt_object adm已交付:"+ ResponseCode.C0320.getDesc() +" 同步结束 #########################");
         }
 
-        //因获取的数据均有主键 使用更新
         String insertUrl = requestUrl(context, migrationInfo, MigrationType.CREATE.getCode());
         if(CollUtil.isEmpty(projObjectNodeList)){
             //调用中台验证待新增的数据