取数平台调整

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/impl/FreeQueryServiceImpl.java

@@ -232,12 +232,10 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 					for (int i = 0; i < metaData.getColumnCount(); i++) {
 						String fieldName = metaData.getColumnLabel(i + 1);
 						Object filedValue;
-						if (queryDataType == QueryDataType.SAFE && FreeQueryServiceImpl.isFilterFields(desensiType, fieldName)) {
-							if(FILETERS_USER_NAME.contains(fieldName)){
-								filedValue = DecryptUtils.dataSecurityProcessUserName(rs.getString(fieldName));
-							} else {
+						if (queryDataType == QueryDataType.SAFE && FreeQueryServiceImpl.isFilterFields(desensiType, fieldName)) {//手机号和卡号
 							filedValue = "******";
-							}
+						}else if(queryDataType == QueryDataType.SAFE && FILETERS_USER_NAME.contains(fieldName)){//用户名
+							filedValue = DecryptUtils.dataSecurityProcessUserName(rs.getString(fieldName));
 						} else {
 							switch (metaData.getColumnType(i + 1)) {
 								case Types.TIMESTAMP: