From 79b92b32c5703e64a5e55b1514c1dbfc093c68c7 Mon Sep 17 00:00:00 2001 From: Mr-wang Date: Wed, 6 Dec 2023 12:21:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=AF=B9EXT6=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=88=A4=E7=A9=BA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reportform/service/ToPageService.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/ToPageService.java b/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/ToPageService.java index 401ecf47..1f849d99 100644 --- a/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/ToPageService.java +++ b/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/ToPageService.java @@ -240,21 +240,25 @@ public class ToPageService extends ActionWeb { fileHandleRowMaps = new ArrayList<>(); for (RowMap fileRowMap : fileRowMaps) { String file_depart = fileRowMap.getString("EXT6"); - file_depart = file_depart.substring(0,file_depart.length()-1); - if (file_depart.contains(",")){ - String[] split = file_depart.split(","); - for (String depart: - split) { - if (UtilString.isNotEmpty(depart) ){ - if (!list.contains(depart)){ - continue; + if (UtilString.isNotEmpty(file_depart)){ + file_depart = file_depart.substring(0,file_depart.length()-1); + if (file_depart.contains(",")){ + String[] split = file_depart.split(","); + for (String depart: + split) { + if (UtilString.isNotEmpty(depart) ){ + if (!list.contains(depart)){ + continue; + } } } + }else { + if (!StringUtils.isEmpty(file_depart) &&!list.contains(file_depart)){ + continue; + } } }else { - if (!StringUtils.isEmpty(file_depart) &&!list.contains(file_depart)){ - continue; - } + continue; } String FILEID = fileRowMap.getString("FILEID"); Integer PLLEVEL = fileRowMap.getInt("PLLEVEL");