From 84c941612ba4e3d2b66c78287b472ae48a8f2e39 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Thu, 25 Aug 2022 16:07:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E6=97=B6=EF=BC=8C=E6=96=87=E4=BB=B6=E4=B8=AD=E5=8C=85?= =?UTF-8?q?=E5=90=AB.=E7=9A=84=E6=97=B6=E5=80=99=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E4=B8=8D=E5=AF=B9=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/att/service/impl/AttFileEOServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index 6ade5957..30004a37 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -340,15 +340,17 @@ public class AttFileEOServiceImpl extends ServiceImpl i */ AttFileEO attFileEO = new AttFileEO(); AttFileEO attFileInfo=null; - Integer flag=0; try { attFileEO.setId(attId); attFileInfo = this.baseMapper.selectFileInfoById(attFileEO); if (name.contains(".")) { - if (name.split("\\.")[1].equals(attFileInfo.getFileSuffix())) { + int suffixIndex = name.lastIndexOf("."); + String newSuffix = name.substring(suffixIndex+1).trim(); + if (StringUtils.equals(newSuffix.toUpperCase(),attFileInfo.getFileSuffix().toUpperCase())) { attFileInfo.setOldFileName(name); }else { - attFileInfo.setOldFileName(name.split("\\.")[0].trim()+"."+attFileInfo.getFileSuffix()); + String filename = name.substring(0,suffixIndex).trim(); + attFileInfo.setOldFileName(filename+"."+attFileInfo.getFileSuffix()); } }else { attFileInfo.setOldFileName(name.trim()+"."+attFileEO.getFileSuffix()); @@ -361,6 +363,7 @@ public class AttFileEOServiceImpl extends ServiceImpl i return attFileInfo; } + /** * @Author super_liu * @Description 多文件查询