修改bug

blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java

@@ -84,8 +84,8 @@ public class OssBuilder {
     public OssTemplateRe template(String code) {
         String tenantId = AuthUtil.getTenantId();
         Oss oss = getOss(tenantId, code);
-       // oss.setEndpoint("http://183.247.216.148:9000/");
-        oss.setEndpoint("https://oss-cn-shenzhen.aliyuncs.com/");
+        oss.setEndpoint("http://183.247.216.148:9000/");
+      // oss.setEndpoint("https://oss-cn-shenzhen.aliyuncs.com/");
         Oss ossCached = ossPool.get(tenantId);
         OssTemplateRe template = templatePool.get(tenantId);
         // 若为空或者不一致，则重新加载

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -2731,7 +2731,23 @@ public class ExcelTabController extends BladeController {
                                     }
                                 } else if (tabVal.indexOf("_^_") >= 0) {
                                     String[] tabData = tabVal.split("_\\^_");
-                                    reData.put(key + "__" + tabData[1], tabData[0]);
+                                    if (StringUtils.isNotEmpty(tabData[0])) {
+                                        if (tabVal.contains("[") && tabVal.contains("年")) {
+                                            String[] strings = StringUtils.strip(tabData[0], "[]").split(",");
+                                            reData.put(key + "__" + tabData[1], strings);
+                                        }
+                                        if (tabVal.contains("[") && tabVal.contains("]") && tabVal.indexOf(",") >= 0) {
+                                            String[] strings = StringUtils.strip(tabData[0], "[]").split(",");
+                                            reData.put(key + "__" + tabData[1], strings);
+                                        }
+                                        if(tabVal.contains("[")&&tabVal.contains("]")&&tabVal.indexOf(",")==-1){
+                                        String[]strings= new String[]{StringUtils.strip(tabData[0],"[]")};
+                                            reData.put(key+"__"+tabData[1],strings);
+                                        }
+                                        else {
+                                            reData.put(key + "__" + tabData[1], tabData[0]);
+                                        }
+                                    }
                                 } else {
                                     reData.put(key, tabVal);
                                 }

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

@@ -319,9 +319,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                 Object o = dataInfo2.get(dataMap.get(k).get(0));
                                 dataVal = JSON.toJSONString(o).replace("\"", "");
                             }
-                            if(dataVal.startsWith("[")&&dataVal.endsWith("]")){
-                                dataVal=dataVal.substring(1, dataVal.length() - 1);
-                            }
+
 
                             dataMap2.put(k, dataVal + "_^_" + dataMap.get(k).get(0).split("__")[1]);
                         }
@@ -1557,14 +1555,8 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                     String[] ss = tabData[0].split(",");
                                     ss[0]=StringUtils.deleteWhitespace(ss[0]);
                                     ss[1]=StringUtils.deleteWhitespace(ss[1]);
-                                    if(ss[0].equals(ss[1])){
-                                        reData.put(key + "__" + tabData[1],ss);
-                                    }
+                                    reData.put(key + "__" + tabData[1],ss);
                                 }
-                               else {
-                                    reData.put(key + "__" + tabData[1], tabData[0]);
-                                }
-
                             }
                         }
                     } else {