diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskFlowQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskFlowQueryExe.java index 2ce82ca..1547eb4 100644 --- a/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskFlowQueryExe.java +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/TaskFlowQueryExe.java @@ -86,12 +86,16 @@ public class TaskFlowQueryExe { List taskIds = taskDOs.stream().map(EightworkTaskDO::getId).collect(Collectors.toList()); List flows = taskFlowRepository.list(new QueryWrapper() - .select("DISTINCT step_id as step_id") - .select("step_name") - .select("group_name") .in("task_id", taskIds) .orderByAsc("step_order")); + // 按 step_id 去重 + Map uniqueFlows = new LinkedHashMap<>(); + for (TaskFlowDO flow : flows) { + uniqueFlows.putIfAbsent(flow.getStepId(), flow); + } + flows = new ArrayList<>(uniqueFlows.values()); + // 转换为 CO List flowCOs = taskFlowCoConvertor.converDOsToCOs(flows); diff --git a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogPageQry.java b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogPageQry.java index f0903be..065aab0 100644 --- a/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogPageQry.java +++ b/web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogPageQry.java @@ -25,7 +25,7 @@ public class TaskLogPageQry extends PageQuery { * - `ne`: 不等比较查询,对应SQL的!=操作符 */ private String eqWorkType; - private int eqStatus; - private int eqCurrentStep; + private Integer eqStatus; + private Integer eqStepId; }