From bb0b80bd7ca7c1f979ab0125ae01f3faa1d14f4b Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:37:57 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_business' into fix/hsy/20260811
---
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
index 2101b22..5ef8a14 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
@@ -58,8 +58,9 @@
List<DeptRespDTO> startDepts = metaInfo != null ? convertList(metaInfo.getStartDeptIds(), deptMap::get) : null;
return buildModel0(model, metaInfo, form, category, deployment, processDefinition, startUsers, startDepts);
});
- // 鎺掑簭
- result.sort(Comparator.comparing(BpmModelMetaInfoVO::getSort));
+ // 鎺掑簭锛氭墜宸ラ儴缃诧紙DB 鐩存彃锛夌殑妯″瀷鍙兘娌℃湁 metaInfo/sort锛屽厹搴曟帓鍒版渶鍚�
+ result.sort(Comparator.comparing(BpmModelMetaInfoVO::getSort,
+ Comparator.nullsLast(Comparator.naturalOrder())));
return result;
}
--
Gitblit v1.9.3