取数平台调整

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/entity/CsvResultSetHelper.java

@@ -65,22 +65,28 @@ public class CsvResultSetHelper implements ResultSetHelper {
 			for (int i=0; i<columnCount; i++) {
 				String columnName = resultSet.getMetaData().getColumnLabel(i + 1);
 				String columnNameOri = resultSet.getMetaData().getColumnName(i + 1);
-				System.out.println("columnName = " + columnName);
+				System.out.println("columnNameOri = " + columnNameOri);
 				// 数据处理判断
 				boolean doDesensi = false; // 是否进行脱敏
 				boolean doDecrypt = false; // 是否进行解密
 				if (this.filterMode.equals(CsvDataFilterMode.DESENSI)) { // 如果需要脱敏
 					if (this.filters != null && this.filters.size() > 0) {
-						if(filters.contains(columnName) || FreeQueryServiceImpl.FILETERS_USER_NAME.contains(columnNameOri)){
+						if(filters.contains(columnName)){
+							doDesensi = true;
+						}
+					}
+					if(FreeQueryServiceImpl.FILETERS_USER_NAME.contains(columnNameOri)){
 						doDesensi = true;
 					}
-					} // IF OVER
 				} else if (this.filterMode.equals(CsvDataFilterMode.DECRYPT)) { // 如果需要解密
 					if (this.filters != null && this.filters.size() > 0) {
-						if(filters.contains(columnName) || FreeQueryServiceImpl.FILETERS_USER_NAME.contains(columnNameOri)){
+						if(filters.contains(columnName)){
+							doDecrypt = true;
+						}
+					}
+					if(FreeQueryServiceImpl.FILETERS_USER_NAME.contains(columnNameOri)){
 						doDecrypt = true;
 					}
-					} // IF OVER
 				}
 				// 数据处理
 				if (doDesensi) { // 如果需要脱敏处理