瀏覽代碼

Merge remote-tracking branch 'jueyue/master'

4.1.3.A
dpxiaofei 9 年之前
父節點
當前提交
43a9acd955
共有 2 個文件被更改,包括 40 次插入4 次删除
  1. +4
    -2
      easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiMergeCellUtil.java
  2. +36
    -2
      pom.xml

+ 4
- 2
easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiMergeCellUtil.java 查看文件

@@ -166,8 +166,7 @@ public final class PoiMergeCellUtil {
// 存在依赖关系 // 存在依赖关系
if (mergeEntity.getText().equals(text)) { if (mergeEntity.getText().equals(text)) {
for (int i = 0; i < delys.length; i++) { for (int i = 0; i < delys.length; i++) {
if (!getCellNotNullText(cell, delys[i], rowNum).equals(
mergeEntity.getRelyList().get(i))) {
if (mergeEntity.getRelyList().get(i) ==null || !mergeEntity.getRelyList().get(i).equals(getCellNotNullText(cell, delys[i], rowNum))) {
return false; return false;
} }
} }
@@ -185,6 +184,9 @@ public final class PoiMergeCellUtil {
* @return * @return
*/ */
private static String getCellNotNullText(Cell cell, int index, int rowNum) { private static String getCellNotNullText(Cell cell, int index, int rowNum) {
if(cell == null || cell.getRow() == null){
return null;
}
if(cell.getRow().getCell(index) != null && StringUtils.isNotEmpty(cell.getRow().getCell(index).getStringCellValue())){ if(cell.getRow().getCell(index) != null && StringUtils.isNotEmpty(cell.getRow().getCell(index).getStringCellValue())){
return cell.getRow().getCell(index).getStringCellValue(); return cell.getRow().getCell(index).getStringCellValue();
} }


+ 36
- 2
pom.xml 查看文件

@@ -137,7 +137,7 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<!-- PDF --> <!-- PDF -->
<dependency> <dependency>
<groupId>com.itextpdf</groupId> <groupId>com.itextpdf</groupId>
@@ -150,7 +150,6 @@
<groupId>com.itextpdf</groupId> <groupId>com.itextpdf</groupId>
<artifactId>itext-asian</artifactId> <artifactId>itext-asian</artifactId>
<version>5.2.0</version> <version>5.2.0</version>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
@@ -176,6 +175,27 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.5</version>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile>
<releaseProfiles>release</releaseProfiles>
<goals>deploy</goals>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@@ -186,6 +206,20 @@
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>


Loading…
取消
儲存