Merge remote-tracking branch 'origin/master'

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -300,7 +300,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                         dataMap2.put(k, lastStr);
                     } else {
                         String dataVal = dataInfo2.getString(dataMap.get(k).get(0));
-                        dataMap2.put(k, dataVal + "_^_" + dataMap.get(k).get(0).split("__")[1]);
+                        if (StringUtils.isNotEmpty(dataVal)) {
+                            dataMap2.put(k, dataVal + "_^_" + dataMap.get(k).get(0).split("__")[1]);
+                        }
                     }
                 }
                 dataMap2.put("p_key_id", tableInfo.getPkeyId());
@@ -1106,7 +1108,12 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     } else if (tabVal.indexOf("_^_") >= 0) {
                         String[] tabData = tabVal.split("_\\^_");
                         if (StringUtils.isNotEmpty(tabData[0])) {
-                            reData.put(key + "__" + tabData[1], tabData[0]);
+                            if (tabVal.contains("[") && tabVal.contains("年")) {
+                                String[] strings = StringUtils.strip(tabData[0], "[]").split(",");
+                                reData.put(key + "__" + tabData[1], strings);
+                            }else {
+                                reData.put(key + "__" + tabData[1], tabData[0]);
+                            }
                         }
                     } else {
                         reData.put(key, tabVal);