Commit 2ebecd3c authored by zhuxiang's avatar zhuxiang
Browse files

优化

parent d18fcce6
......@@ -511,17 +511,60 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
}
private void filterWhite(List<ExcelDataEntity> excelDataEntityList) {
//查看白名单
// 查看白名单
List<String> whiteUser = whiteService.queryList();
// 如果白名单为空,直接返回
if (whiteUser == null || whiteUser.isEmpty()) {
return;
}
Iterator<ExcelDataEntity> iterator = excelDataEntityList.iterator();
while (iterator.hasNext()) {
ExcelDataEntity excelDataEntity = iterator.next();
whiteUser.forEach(whiteUserName -> {
if (excelDataEntity.getPayUserName().contains(whiteUserName) || excelDataEntity.getPayeeName().contains(whiteUserName)) {
iterator.remove(); // 安全移除元素
String payUserName = excelDataEntity.getPayUserName();
String payeeName = excelDataEntity.getPayeeName();
for (String whiteUserName : whiteUser) {
System.out.println("白名单" + whiteUserName);
// 检查 payUserName 是否包含白名单用户
if (payUserName != null) {
boolean remove = false;
if (payUserName.length() >= whiteUserName.length()) {
if (payUserName.contains(whiteUserName)) {
remove = true;
}
} else {
if (whiteUserName.contains(payUserName)) {
remove = true;
}
}
if (remove) {
iterator.remove(); // 安全移除元素
System.out.println("付款人" + payUserName);
break; // 找到匹配的白名单用户后,退出内层循环
}
}
});
// 检查 payeeName 是否包含白名单用户
if (payeeName != null) {
boolean remove = false;
if (payeeName.length() >= whiteUserName.length()) {
if (payeeName.contains(whiteUserName)) {
remove = true;
}
} else {
if (whiteUserName.contains(payeeName)) {
remove = true;
}
}
if (remove) {
iterator.remove(); // 安全移除元素
System.out.println("收款人" + payUserName);
break; // 找到匹配的白名单用户后,退出内层循环
}
}
}
}
}
......
......@@ -223,12 +223,59 @@ public class GroupDetailServiceImpl extends ServiceImpl<GroupDetailMapper, Group
}
private void filterWhite(List<ExcelDataVO> excelDataEntityList) {
//查看白名单
// 查看白名单
List<String> whiteUser = whiteService.queryList();
// 如果 name 属性值存在于白名单中,则移除该元素
excelDataEntityList.removeIf(entity -> whiteUser.contains(entity.getPayUserName()) || whiteUser.contains(entity.getPayeeName()));
}
// 如果白名单为空,直接返回
if (whiteUser == null || whiteUser.isEmpty()) {
return;
}
Iterator<ExcelDataVO> iterator = excelDataEntityList.iterator();
while (iterator.hasNext()) {
ExcelDataVO excelDataEntity = iterator.next();
String payUserName = excelDataEntity.getPayUserName();
String payeeName = excelDataEntity.getPayeeName();
for (String whiteUserName : whiteUser) {
// 检查 payUserName 是否包含白名单用户
if (payUserName != null) {
boolean remove = false;
if (payUserName.length() >= whiteUserName.length()) {
if (payUserName.contains(whiteUserName)) {
remove = true;
}
} else {
if (whiteUserName.contains(payUserName)) {
remove = true;
}
}
if (remove) {
iterator.remove(); // 安全移除元素
break; // 找到匹配的白名单用户后,退出内层循环
}
}
// 检查 payeeName 是否包含白名单用户
if (payeeName != null) {
boolean remove = false;
if (payeeName.length() >= whiteUserName.length()) {
if (payeeName.contains(whiteUserName)) {
remove = true;
}
} else {
if (whiteUserName.contains(payeeName)) {
remove = true;
}
}
if (remove) {
iterator.remove(); // 安全移除元素
break; // 找到匹配的白名单用户后,退出内层循环
}
}
}
}
}
@Override
public void personExport(GroupDetailDTO groupDetailDTO, HttpServletResponse response) {
......
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