Merge branch 'dev-template' of http://192.168.2.236:10080/louhr/qc into dev-template

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

@@ -34,7 +34,8 @@ public class OrdinaryAssistant {
             } else {
                 targetKey = arry[1];
             }
-            if (!retMap.containsKey(targetKey) || StringUtil.isNotBlank(sourceMap_.get(sourceKey))) {
+            if (StringUtil.isNotBlank(sourceMap_.get(sourceKey))
+                    &&(!retMap.containsKey(targetKey)||StringUtil.isBlank(retMap.get(targetKey)))) {
                 retMap.put(targetKey, sourceMap_.get(sourceKey));
             }
             removeKey.add(sourceKey);