Browse Source

读excel修复

menglu 3 years ago
parent
commit
05c517552f

+ 4 - 5
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExcelCommonUtil.java

@@ -37,7 +37,7 @@ public class ExcelCommonUtil {
 		int buildingIndex = -1;
 		for (int i = 0; i < sheetContent.titleColList.size(); i++) {
 			String name = sheetContent.titleColList.get(i);
-			if (name.equals(col)) {
+			if (col.equals(name)) {
 				buildingIndex = i;
 				break;
 			}
@@ -46,7 +46,7 @@ public class ExcelCommonUtil {
 		int titleIndex = -1;
 		for (int i = 0; i < sheetContent.titleRowList.size(); i++) {
 			String name = sheetContent.titleRowList.get(i);
-			if (name.equals(row)) {
+			if (row.equals(name)) {
 				titleIndex = i;
 				break;
 			}
@@ -65,7 +65,7 @@ public class ExcelCommonUtil {
 		int buildingIndex = -1;
 		for (int i = 0; i < sheetContent.titleColList.size(); i++) {
 			String name = sheetContent.titleColList.get(i);
-			if (name.equals(col)) {
+			if (col.equals(name)) {
 				buildingIndex = i;
 				break;
 			}
@@ -286,10 +286,9 @@ public class ExcelCommonUtil {
 				String cellValue = GetCellValue(cell);
 				if (cellValue != null && cellValue.trim().length() > 0) {
 					value = cellValue.trim();
-					result.titleColList.add(value);
 				}
 			}
-//			result.titleColList.add(value);
+			result.titleColList.add(value);
 		}
 
 		for (int index_row = row_from + 1; index_row <= row_to; index_row++) {