From 0e3a6cac9b374fca07b94768f03ecd9ec389acc9 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 24 四月 2024 17:17:40 +0800 Subject: [PATCH] 4、因日志记录的大字段信息太长导致卡顿,所以调整集成日志,操作日志,本地日志,修改表格列表不查询显示大字段,点击详情时才显示详细信息。 5、日志页面增加查询属性(页面显示的属性都加上),支持模糊查询。 --- Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java index 63e35bb..3e48538 100644 --- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java +++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java @@ -39,7 +39,6 @@ import org.flowable.engine.repository.ProcessDefinition; import org.flowable.engine.runtime.ProcessInstance; import org.flowable.task.api.Task; -import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.Condition; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; @@ -199,17 +198,21 @@ flowTaskUserCi.setToTaskName(targetFlow.getName()); taskList.add(flowTaskUserCi); } - // 濡傛灉涓嬩釜瀹℃壒鑺傜偣涓烘帓浠栫綉鍏� - if (targetFlow instanceof ExclusiveGateway) { + // 濡傛灉涓嬩釜瀹℃壒鑺傜偣涓虹綉鍏� + if (targetFlow instanceof Gateway) { ExclusiveGateway exclusiveGateway = (ExclusiveGateway) targetFlow; List<SequenceFlow> exclusiveGatewayOutgoingFlows = exclusiveGateway.getOutgoingFlows(); for (SequenceFlow nexti:exclusiveGatewayOutgoingFlows){ String conditionExpression = nexti.getConditionExpression();//condition + String taskId = nexti.getTargetRef();//taskId String name = nexti.getName();//toName,椹冲洖銆佸悓鎰� - String taskName = taskMap.get(targetFlow.getId()); - + String taskName = taskMap.get(taskId); +//ExclusiveGateway + if(StringUtils.isEmpty(conditionExpression)){//姝ゆ椂鎺掍粬缃戝叧娌℃湁閰嶇疆娴佽浆鏉′欢 + continue; + } for (FlowTaskDTO flowTaskUserCi:mis){ if(taskId.equals(flowTaskUserCi.getTaskId())){ flowTaskUserCi.setCondition(conditionExpression); -- Gitblit v1.9.3