Merge branch 'master' into feature-3.0

jxlsteam · Dec 18, 2023 · 46f22a0 · 46f22a0
2 parents 2d69c23 + 79620c1
commit 46f22a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/jxls-poi/src/main/java/org/jxls/transform/poi/PoiTransformer.java b/jxls-poi/src/main/java/org/jxls/transform/poi/PoiTransformer.java
@@ -461,6 +461,7 @@ private List<CellData> readCommentsFromSheet(Sheet sheet, int rowNum) {
                 }
             }
         }
+        commentDataCells.sort((a, b) -> a.getCol() - b.getCol());
         return commentDataCells;
     }
 

diff --git a/jxls-site/pom.xml b/jxls-site/pom.xml
@@ -5,13 +5,13 @@
     <groupId>org.jxls</groupId>
     <artifactId>jxls-site</artifactId>
     <packaging>jar</packaging>
-    <version>2.13.0</version>
+    <version>2.14.0</version>
     <name>JXLS</name>
     <url>http://jxls.sf.net/</url>
 
     <properties>
-        <jxlsVersion>2.13.0</jxlsVersion>
-        <jxlsPoiVersion>2.13.0</jxlsPoiVersion>
+        <jxlsVersion>2.14.0</jxlsVersion>
+        <jxlsPoiVersion>2.14.0</jxlsPoiVersion>
         <jxlsReaderVersion>2.0.6</jxlsReaderVersion>
         <copyrightClass>pull-right</copyrightClass>
     </properties>
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
             }
+            commentDataCells.sort((a, b) -> a.getCol() - b.getCol());
             return commentDataCells;
         }
@@ Expand Down @@