fix: 修复false时候导出为空的问题

9a2e7e6f · liyijie · bde9e968 · 9a2e7e6f · 9a2e7e6f
Commit 9a2e7e6f authored Nov 24, 2022 by liyijie
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 10 deletions

export.rb lib/tallty_import_export/export.rb +8 -9

version.rb lib/tallty_import_export/version.rb +1 -1

No files found.
--- a/lib/tallty_import_export/export.rb
+++ b/lib/tallty_import_export/export.rb
@@ -211,15 +211,14 @@ module TalltyImportExport
        if r.is_a?(Array)
          r.try(m) || r.try(:[], m.to_i)
        else
-          begin
+          data = r.try(:[], m) rescue nil
-            r.try(:[], m)
+          if data.nil?
-          rescue StandardError
+            data = r.try(:[], m.to_sym) rescue nil
-            nil
+          end
-          end || begin
+          if  data.nil?
-            r.try(:[], m.to_sym)
+            data = r.try(m) rescue nil
-          rescue StandardError
+          end
-            nil
+          data
-          end || r.try(m)
        end
      end
    end

--- a/lib/tallty_import_export/version.rb
+++ b/lib/tallty_import_export/version.rb
 module TalltyImportExport
-  VERSION = '1.1.3'
+  VERSION = '1.1.5'
 end