模板数据修改

kernel/src/main/java/com/lantone/qc/kernel/util/ModuleMappingUtil.java

@@ -2,7 +2,7 @@ package com.lantone.qc.kernel.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.collections.MapUtils;
@@ -37,21 +37,20 @@ public class ModuleMappingUtil {
         if (MapUtils.isEmpty(pageData)) {
             return;
         }
+        List<Map<String, String>> sourceMaps = Lists.newArrayList();
         pageData.keySet().forEach(pageDataKey -> {
             Object object = pageData.get(pageDataKey);
             if (object instanceof List) {
-                List<Map<String, String>> sourceMaps = (List) object;
-                if (ListUtil.isNotEmpty(sourceMaps)) {
-                    sourceMaps.forEach(sourceMap -> {
-                        if (MapUtils.isNotEmpty(sourceMap)) {
-                            sourceMap.put("mode_id", xmlDataTypeModuleInfo.get(sourceMap.keySet()));
-                        }
-                    });
-                }
+                sourceMaps.addAll((List) object);
             } else if (object instanceof Map) {
-                Map<String, String> sourceMap = (Map) object;
-                if (MapUtils.isNotEmpty(sourceMap)) {
-                    sourceMap.put("mode_id", xmlDataTypeModuleInfo.get(sourceMap.keySet()));
+                sourceMaps.add((Map) object);
+            }
+        });
+        sourceMaps.forEach(sourceMap -> {
+            if (MapUtils.isNotEmpty(sourceMap)) {
+                String modeId = xmlDataTypeModuleInfo.get(sourceMap.keySet());
+                if (StringUtil.isNotBlank(modeId)) {
+                    sourceMap.put("mode_id", modeId);
                 }
             }
         });