From bf2b51820d12d8ade4d1af1c6ba48c8f81f75692 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 26 Oct 2022 15:52:05 +0800 Subject: [PATCH] =?UTF-8?q?61777-=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationEOServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index cefc08e86..0b39ff36e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -712,17 +712,19 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl flowDetailQueryWrap = new QueryWrapper<>(); flowDetailQueryWrap.lambda().eq(LawsTechnologyEvaluationFlowDetailEO::getEvaluatorId,currentUser.getId()); List flowDetailEOList = this.lawsTechnologyEvaluationFlowDetailEOService.list(flowDetailQueryWrap); - if(CollectionUtils.isNotEmpty(flowDetailEOList)){ - List lawsTechnologyEvaluationIdList = flowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getLawsTechnologyEvaluationId).distinct().collect(Collectors.toList()); - queryWrapper.and(query -> { - query.eq("create_by",currentUser.getUsername()); + + queryWrapper.and(query -> { + query.eq("create_by",currentUser.getUsername()); + if(CollectionUtils.isNotEmpty(flowDetailEOList)){ + List lawsTechnologyEvaluationIdList = flowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getLawsTechnologyEvaluationId).distinct().collect(Collectors.toList()); query.or(q -> { for (String lawsTechnologyEvaluationId : lawsTechnologyEvaluationIdList) { q.or().like("id",lawsTechnologyEvaluationId); } }); - }); - } + } + }); + } }