Commit 9a5e94c0 by 陶光胜

Merge branch 'developer' into 'master'

Developer

See merge request !26
parents 71469c4f d0adfc0b
...@@ -443,7 +443,7 @@ public class FreeQueryServiceImpl implements IFreeQueryService { ...@@ -443,7 +443,7 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
if (task.getQueryDataType() == QueryDataType.SAFE if (task.getQueryDataType() == QueryDataType.SAFE
&& (FreeQueryServiceImpl.isFilterFields(condition.getDesensiType(), cName) || FreeQueryServiceImpl.FILETERS_USER_NAME.contains(cName))) { && (FreeQueryServiceImpl.isFilterFields(condition.getDesensiType(), cName) || FreeQueryServiceImpl.FILETERS_USER_NAME.contains(cName))) {
if(FreeQueryServiceImpl.FILETERS_USER_NAME.contains(cName)){ if(FreeQueryServiceImpl.FILETERS_USER_NAME.contains(cName)){
row.createCell(j).setCellValue(DecryptUtils.dataSecurityProcessUserName(rs.getString(cName))); row.createCell(j).setCellValue(DecryptUtils.dataSecurityProcessUserName(rs.getString(j+1)));
} else { } else {
row.createCell(j).setCellValue("******"); row.createCell(j).setCellValue("******");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment