xml key转换修改

trans/src/main/java/com/lantone/qc/trans/comsis/OrdinaryAssistant.java

@@ -34,9 +34,11 @@ public class OrdinaryAssistant {
             } else {
                 targetKey = arry[1];
             }
-            retMap.put(targetKey, sourceMap_.get(sourceKey));
+            if (!retMap.containsKey(targetKey) || StringUtil.isNotBlank(sourceMap_.get(sourceKey))) {
+                retMap.put(targetKey, sourceMap_.get(sourceKey));
+            }
             removeKey.add(sourceKey);
-//            sourceMap_.remove(sourceKey); // 如果直接remove，多个标准key对应xml中同一个key就会出问题
+            //            sourceMap_.remove(sourceKey); // 如果直接remove，多个标准key对应xml中同一个key就会出问题
         }
         //        retMap.putAll(sourceMap_); //如果key相同会覆盖之前的值，存在bug
         Set<String> keySet = retMap.keySet();