From 9e28453dba6ecf93c6c2234ba38def7c41cf12f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 18:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java
index 5d39aaf..9927f1c 100644
--- a/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java
@@ -91,23 +91,25 @@
public Result list(ProcessConfigInfoQuery query) {
List<FlowProcDefWithConfigDto> dataList = flowDeployMapper.selectDeployListWithConfig(query);
- // 鏍规嵁 processDefId 鍒嗙粍锛屽苟鍙栨瘡缁勪腑 鐗堟湰鍙� 鏈�澶х殑閭ｄ竴涓�
- Map<String, FlowProcDefWithConfigDto> groupedByProcessDefId = dataList.stream()
- .collect(Collectors.toMap(
- FlowProcDefWithConfigDto::getProcessDefId, // keyMapper: 鎻愬彇 processDefId 浣滀负閿�
- Function.identity(), // valueMapper: 鐩存帴浣跨敤瀵硅薄浣滀负鍊�
- BinaryOperator.maxBy(Comparator.comparingInt(FlowProcDefWithConfigDto::getProcessDefVersion)) // mergeFunction: 姣旇緝 processDefVersion锛屽彇鏈�澶х殑
- ));
- List<FlowProcDefWithConfigDto> resultList = new ArrayList<>(groupedByProcessDefId.values());
+// // 鏍规嵁 processDefId 鍒嗙粍锛屽苟鍙栨瘡缁勪腑 鐗堟湰鍙� 鏈�澶х殑閭ｄ竴涓�
+// Map<String, FlowProcDefWithConfigDto> groupedByProcessDefId = dataList.stream()
+// .collect(Collectors.toMap(
+// FlowProcDefWithConfigDto::getProcessDefId, // keyMapper: 鎻愬彇 processDefId 浣滀负閿�
+// Function.identity(), // valueMapper: 鐩存帴浣跨敤瀵硅薄浣滀负鍊�
+// BinaryOperator.maxBy(Comparator.comparingInt(FlowProcDefWithConfigDto::getProcessDefVersion)) // mergeFunction: 姣旇緝 processDefVersion锛屽彇鏈�澶х殑
+// ));
+// List<FlowProcDefWithConfigDto> resultList = new ArrayList<>(groupedByProcessDefId.values());
// 鍔犺浇鎸傝〃鍗�
- for (FlowProcDefWithConfigDto procDef : resultList) {
+ for (FlowProcDefWithConfigDto procDef : dataList) {
+ // 鎺掗櫎鏆傚仠鐨�
+
SysForm sysForm = sysDeployFormService.selectSysDeployFormByDeployId(procDef.getDeploymentId());
if (Objects.nonNull(sysForm)) {
procDef.setFormName(sysForm.getFormName());
procDef.setFormId(sysForm.getFormId());
}
}
- return Result.ok().data(resultList);
+ return Result.ok().data(dataList);
}
}
--
Gitblit v1.8.0