Преглед на файлове

公式-空格数据占位符设置

LHB преди 1 седмица
родител
ревизия
3b4fa1f246

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

@@ -1600,16 +1600,19 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         }
         for (String key : dataMap2.keySet()) {
             String[] split = key.split("_");
+            String value = dataMap2.get(key);
+            //删除占位符
+            value = value.replaceAll("/!@#\\$%\\^","");
+
             if (split.length > 1 && Integer.parseInt(split[1]) > 80) {
                 // 大于80则保留在扩展字段中
-                opsParamMap.put(key, dataMap2.get(key));
+                opsParamMap.put(key, value);
             } else {
-                String value = dataMap2.get(key);
                 if (value != null) {
                     Integer i = map.get(key);
                     // 长度超过数据库长度也保留在扩展字段中
                     if (i != null &&  value.length() > i) {
-                        opsParamMap.put(key, dataMap2.get(key));
+                        opsParamMap.put(key, value);
                         continue;
                     }
                 }

+ 2 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -1602,7 +1602,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                                     }
                                     if (local.size() > 0) {
                                         List<Object> values = FormulaUtils.slice(local, f);
-                                        values = values.stream().map(s -> StringUtils.isEmpty(s) ? "/" : s).collect(Collectors.toList());
+                                        //设置特殊展位符
+                                        values = values.stream().map(s -> StringUtils.isEmpty(s) ? "/!@#$%^" : s).collect(Collectors.toList());
                                         FormulaUtils.write(fd, values, !fd.getTableName().equals(checkTable));
                                     }
                                 } else {