公式说明数据展示优化

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

@@ -1413,7 +1413,14 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     }
                     for (int i = 0; i < values.size(); i++) {
                         if (values.get(i).getY() == y && values.get(i).getX() == x) {
-                            resultData = (String)values.get(i).getValue();
+                            String value = values.get(i).stringValue();
+                            if (StringUtil.isBlank( value)) {
+                                value = "";
+                                if (resultFormData.getInitial().size() > i && resultFormData.getInitial().get(i) != null) {
+                                    value = resultFormData.getInitial().get(i).stringValue();
+                                }
+                            }
+                            resultData = value;
                             index = i;
                             break;
                         }
@@ -1426,6 +1433,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                         if (formData != null && formData.getValues() != null) {
                             if (formData.getValues().size() > tempIndex) {
                                 ElementData elementData = formData.getValues().get(tempIndex);
+                                if ((elementData ==  null || StringUtil.isBlank(elementData.stringValue())) && formData.getInitial() != null && formData.getInitial().size() > tempIndex ) {
+                                    elementData = formData.getInitial().get(tempIndex);
+                                }
                                 data.append(elementData == null || elementData.getValue() == null ? "" : elementData.getValue().toString());
                             }
                             data.append(" ,");