Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/util/CoreUtil.java

@@ -190,8 +190,15 @@ public class CoreUtil {
             String key = (String)field.get(object);
             if (value != null && value.get(key) != null) {
                 Field standField = getDeclaredField(object, standName) ;
-                standField.setAccessible(true) ;
-                standField.set(object, value.get(key));
+                standField.setAccessible(true);
+                if ("uniqueName".equals(standName)) {
+                    String uniqueName = (String)standField.get(object);
+                    if (StringUtil.isBlank(uniqueName)) {
+                        standField.set(object, value.get(key));
+                    }
+                } else {
+                    standField.set(object, value.get(key));
+                }
             }
         } catch (IllegalArgumentException e) {
             e.printStackTrace();
@@ -267,7 +274,7 @@ public class CoreUtil {
      * @param item
      * @return
      */
-    public static Map compareNameWithNode(NodeNeoDTO nodeNeoDTO,  List<? extends Item> item) {
+    public static Map compareNameWithNode(NodeNeoDTO nodeNeoDTO, List<? extends Item> item) {
         Map<String, Object> map = new LinkedHashMap<>();
         boolean flag = false;
         if (ListUtil.isNotEmpty(item) && nodeNeoDTO != null) {