From d8b397733e8f0ec2fcc91bb34fabe9b145b7896b Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 8 Aug 2024 11:36:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=96=E6=A0=87=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProcessStandardComplianceCheckServiceImpl.java | 6 ++++++ .../modules/laws/common/mapper/xml/LawsCommonMapper.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index 9aa8c704..a6a59d36 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -1129,6 +1129,9 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl list = list(); List collect = list.stream().filter(e -> StrUtil.isNotBlank(e.getStandardId())).collect(Collectors.toList()); + if (collect.isEmpty()) { + return new ArrayList<>(); + } // 去流程主表判断对应的流程是否已经结束 List prcIdList = collect.stream().map(ProcessStandardComplianceCheck::getProcessInstanceId) .collect(Collectors.toList()); @@ -1137,6 +1140,9 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl incompleteList = paService.list(wrapper); + if (incompleteList.isEmpty()) { + return new ArrayList<>(); + } List incompletePrcIdList = incompleteList.stream().map(ProcessAll::getProcessInstanceId).collect(Collectors.toList()); // 筛选出未完成的流程对应的标准id return collect.stream().filter(e -> incompletePrcIdList.contains(e.getProcessInstanceId())) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml index 841e5ae5..1ec3a68e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml @@ -68,7 +68,7 @@ UNION ALL - SELECT id, standard_number, standard_name, release_date, standard_state, '3' AS source, create_time, + SELECT id, standard_number, standard_name, release_date, standard_state as es_standard_state, '3' AS source, create_time, null as new_product_impl_date, null as new_auth_impl_date, create_by, null as responsible_user FROM laws_enterprise_standard WHERE del_flag = 0) standard