From 14e2b3368ca03592e5b1263661ed9a382c71275c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Dec 2021 16:15:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=92=8Cocr=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=87=E4=BB=B6=E5=87=BA=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandFileEOServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 848d2eed..9bfa3851 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -100,7 +101,7 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { for (String key:result.getAttrInfoCaseMap().keySet()) { if (null!=result.getAttrInfoCaseMap().get(key) && !"".equals(result.getAttrInfoCaseMap().get(key))){ if (result.getAttrInfoCaseMap().get(key).toString().contains(",")){ - choose.add(result.getAttrInfoCaseMap().get(key).toString().replace(",","")); + choose.addAll(new ArrayList<>(Arrays.asList(result.getAttrInfoCaseMap().get(key).toString().split(",")))); }else { choose.add(result.getAttrInfoCaseMap().get(key).toString()); } @@ -112,7 +113,11 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { } queryWrapper.eq("STAND_ID",standId); - queryWrapper.eq("USE_MODEL","SOURCE_FILE"); + if ("0".equals(type)){ + queryWrapper.eq("USE_MODEL", "WEB_FILE"); + }else { + queryWrapper.eq("USE_MODEL", "SOURCE_FILE"); + } queryWrapper.in("ATT_ID",choose); List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper);