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 d341e1c0..6b91b827 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 @@ -251,6 +251,11 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl pageList(Page page, ProcessApprovalRecord processApprovalRecord, String type, HttpServletRequest req) { - boolean allSnapshotFlag = !type.equals(COMPLETED_RECORD_LIST); + boolean allSnapshotFlag = type.equals(ALL_RECORD_LIST); String curUserId = UserUtils.getUserId(); QueryWrapper wrapper = new QueryWrapper<>(); if (StringUtils.isNotBlank(processApprovalRecord.getFinishFlagSearch())){ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java index 8609fc58..c1a89cf3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java @@ -1,6 +1,8 @@ package com.jero.modules.activiti.service; import cn.hutool.core.collection.CollStreamUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.YesOrNoEnum; @@ -23,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.jero.modules.activiti.common.ActivitiCommon.*; +import static com.jero.modules.activiti.common.ActivitiCommon.DISTRIBUTE; import static com.jero.modules.activiti.process.standardComplianceCheck.common.ProcessStandardComplianceCheckConstants.*; /** @@ -130,9 +132,13 @@ public class ProcessNodeService extends ServiceImpl processNodeList, String processInstanceId) { + if (StrUtil.isBlank(processInstanceId)) { + return; + } // 如果没分发 则不显示 主排查人单线审核 主排查人汇总节点 String mainInstanceId = (String) runtimeService.getVariable(processInstanceId, ActivitiCommon.MAIN_INSTANCE_ID); - boolean distribute = (boolean) runtimeService.getVariable(mainInstanceId, DISTRIBUTE); + Object variable = runtimeService.getVariable(mainInstanceId, DISTRIBUTE); + boolean distribute = ObjectUtil.isNotNull(variable) && YesOrNoEnum.YES.getValue().equals(variable.toString()); if (!distribute) { processNodeList.removeIf( v -> v.getXmlNodeId().equals(MAIN_CHECK_USER_APPROVAL) || v.getXmlNodeId().equals(MAIN_CHECK_USER_COLLECT));